[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#48233] [PATCH 3/3] guix-install.sh: Exit early if Guix is already i
From: |
Maxim Cournoyer |
Subject: |
[bug#48233] [PATCH 3/3] guix-install.sh: Exit early if Guix is already installed. |
Date: |
Wed, 5 May 2021 00:32:02 -0400 |
* etc/guix-install.sh (sys_create_store): Move the check & exit before The
Guix binary archive is unpacked. Re-indent tar extraction command.
---
etc/guix-install.sh | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 3d2936c873..f7ef0c2671 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -321,20 +321,18 @@ sys_create_store()
_debug "--- [ ${FUNCNAME[0]} ] ---"
- cd "$tmp_path"
- tar --extract \
- --file "$pkg" &&
- _msg "${PAS}unpacked archive"
-
if [[ -e "/var/guix" || -e "/gnu" ]]; then
_err "${ERR}A previous Guix installation was found. Refusing to
overwrite."
exit 1
- else
- _msg "${INF}Installing /var/guix and /gnu..."
- mv "${tmp_path}/var/guix" /var/
- mv "${tmp_path}/gnu" /
fi
+ cd "$tmp_path"
+ tar --extract --file "$pkg" && _msg "${PAS}unpacked archive"
+
+ _msg "${INF}Installing /var/guix and /gnu..."
+ mv "${tmp_path}/var/guix" /var/
+ mv "${tmp_path}/gnu" /
+
_msg "${INF}Linking the root user's profile"
mkdir -p "~root/.config/guix"
ln -sf /var/guix/profiles/per-user/root/current-guix \
--
2.31.1