me
/
guix
Archived
1
0
Fork 0
Code

guix-install.sh: Fix incomplete installation. 

‘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.
master
Tobias Geerinckx-Rice 2023-07-16 02:00:00 +02:00
parent c89e0b4d20
commit 7419b187d1
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/guix-install.sh
View File

@ -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"