From e29571afc642dd4dd3388f742755f1675b3058e6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 24 Apr 2023 12:46:22 -0400 Subject: guix-install.sh: Fix GUIX_ALLOW_OVERWRITE condition. Before this change, the "Overwriting existing installation!" would be displayed erroneously. * etc/guix-install.sh (sys_create_store): Fix overwrite conditional. --- etc/guix-install.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'etc') diff --git a/etc/guix-install.sh b/etc/guix-install.sh index bbb4219965..e81da7ae71 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -9,7 +9,7 @@ # Copyright © 2020 Daniel Brooks # Copyright © 2021 Jakub Kądziołka # Copyright © 2021 Chris Marusich -# Copyright © 2021, 2022 Maxim Cournoyer +# Copyright © 2021, 2022, 2023 Maxim Cournoyer # Copyright © 2022 Prafulla Giri # Copyright © 2023 Andrew Tropin # @@ -353,10 +353,12 @@ sys_create_store() _debug "--- [ ${FUNCNAME[0]} ] ---" - if [[ -z $GUIX_ALLOW_OVERWRITE && (-e /var/guix || -e /gnu) ]]; then - die "A previous Guix installation was found. Refusing to overwrite." - else - _msg "${WAR}Overwriting existing installation!" + if [[ -e /var/guix && -e /gnu ]]; then + if [ -n "$GUIX_ALLOW_OVERWRITE" ]; then + _msg "${WAR}Overwriting existing installation!" + else + die "A previous Guix installation was found. Refusing to overwrite." + fi fi cd "$tmp_path" -- cgit v1.2.3