diff options
| author | Vincent Legoll <vincent.legoll@gmail.com> | 2020-04-13 18:07:39 +0200 |
|---|---|---|
| committer | Guix Patches Tester <> | 2020-04-14 19:16:29 +0100 |
| commit | 036acbf287309fd11540769879bb0693bbc4e025 (patch) | |
| tree | 0165e3b8adb4994e2f784934a3d0edfcb24c8933 | |
| parent | d890442de50b972d8df32e9c4da8ea7bf833a671 (diff) | |
| download | patches-036acbf287309fd11540769879bb0693bbc4e025.tar patches-036acbf287309fd11540769879bb0693bbc4e025.tar.gz | |
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.
| -rwxr-xr-x | etc/guix-install.sh | 14 |
1 files 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 <rekado@elephly.net> # Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> # Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> +# Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> # # 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 |