From 7419b187d1c884b7fd7494519ed964333c990218 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 16 Jul 2023 02:00:00 +0200
Subject: guix-install.sh: Fix incomplete installation.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

‘false || return’ returns false, and
‘set -e’ aborts the script.  This leaves
Guix half installed with visual indication of error.

* etc/guix-install.sh (sys_customize_bashrc, sys_maybe_setup_selinux):
Explicitly return 0.
---
 etc/guix-install.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'etc')

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 10645ac7ac..982fb0a266 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -581,7 +581,8 @@ sys_create_shell_completion()
 
 sys_customize_bashrc()
 {
-    prompt_yes_no "Customize users Bash shell prompt for Guix?" || return
+    prompt_yes_no "Customize users Bash shell prompt for Guix?" || return 0
+
     for bashrc in /home/*/.bashrc /root/.bashrc; do
         test -f "$bashrc" || continue
         grep -Fq '$GUIX_ENVIRONMENT' "$bashrc" && continue
@@ -615,7 +616,7 @@ sys_maybe_setup_selinux()
     done
 
     prompt_yes_no "Install SELinux policy that might be required to run guix-daemon?" \
-	|| return
+	|| return 0
 
     local var_guix=/var/guix/profiles/per-user/root/current-guix
     semodule -i "${var_guix}/share/selinux/guix-daemon.cil"
-- 
cgit v1.2.3