From 036acbf287309fd11540769879bb0693bbc4e025 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 13 Apr 2020 18:07:39 +0200 Subject: guix-install.sh: Handle local binary tarball file. * etc/guix-install.sh (REQUIRE): add realpath. (main): Handle local binary tarball file path passed as first arg. --- etc/guix-install.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 4fa9664cf5..0d15a05cb4 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -4,6 +4,7 @@ # Copyright © 2018 Ricardo Wurmus # Copyright © 2018 Efraim Flashner # Copyright © 2019 Tobias Geerinckx-Rice +# Copyright © 2020 Vincent Legoll # # This file is part of GNU Guix. # @@ -47,6 +48,7 @@ REQUIRE=( "uname" "groupadd" "tail" + "realpath" "tr" "xz" ) @@ -482,10 +484,14 @@ main() umask 0022 tmp_path="$(mktemp -t -d guix.XXX)" - guix_get_bin_list "${GNU_URL}" - guix_get_bin "${GNU_URL}" "${BIN_VER}" "$tmp_path" - - sys_create_store "${BIN_VER}.tar.xz" "${tmp_path}" + if [ -z "$1" ]; then + guix_get_bin_list "${GNU_URL}" + guix_get_bin "${GNU_URL}" "${BIN_VER}" "$tmp_path" + TARBALL="${BIN_VER}.tar.xz" + else + TARBALL="$(realpath $1)" + fi + sys_create_store "${TARBALL}" "${tmp_path}" sys_create_build_user sys_enable_guix_daemon sys_authorize_build_farms -- cgit v1.2.3