me/guix
Archived
1
0
Fork 0
Code Activity

guix-install.sh: Exit early if Guix is already installed.

Browse source 
* etc/guix-install.sh (sys_create_store): Move the check & exit before The
Guix binary archive is unpacked.  Re-indent tar extraction command.
This commit is contained in:
Maxim Cournoyer 2021-05-04 22:48:20 -04:00
parent 5b0ce3393b
commit 74009c4cf0
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
etc/guix-install.sh
View file

@ -322,20 +322,18 @@ sys_create_store()
_debug "--- [ ${FUNCNAME[0]} ] ---" _debug "--- [ ${FUNCNAME[0]} ] ---"
cd "$tmp_path"
tar --extract \
--file "$pkg" &&
_msg "${PAS}unpacked archive"
if [[ -e "/var/guix" || -e "/gnu" ]]; then if [[ -e "/var/guix" || -e "/gnu" ]]; then
_err "${ERR}A previous Guix installation was found. Refusing to overwrite." _err "${ERR}A previous Guix installation was found. Refusing to overwrite."
exit 1 exit 1
else
_msg "${INF}Installing /var/guix and /gnu..."
mv "${tmp_path}/var/guix" /var/
mv "${tmp_path}/gnu" /
fi 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" _msg "${INF}Linking the root user's profile"
mkdir -p "~root/.config/guix" mkdir -p "~root/.config/guix"
ln -sf /var/guix/profiles/per-user/root/current-guix \ ln -sf /var/guix/profiles/per-user/root/current-guix \