diff options
| author | David Boilleau <david_boilleau@gmx.fr> | 2024-11-08 15:10:23 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-11-14 15:41:21 +0100 |
| commit | 8edd08116452bf6ecd3eff7a7f98f9b0991097df (patch) | |
| tree | 441391a21e3093fbd8bc6143d6f4b2faa02a743f | |
| parent | e02b3b0a666ed541b4393802129c1d1660ca0df5 (diff) | |
guix-install.sh: Replace `ROOT_HOME` with `~root`
The `ROOT_HOME` variable is natively absent from some systems, however the form
`~root`, which is used by the install functions in this same file, works.
* etc/guix-install.sh (sys_delete_store, sys_delete_guix_daemon)
(sys_delete_user_profiles): Replace `ROOT_HOME` with `~root`.
Change-Id: Ia867e271ac4c5557d9708235fee028bccce68342
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rwxr-xr-x | etc/guix-install.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh index e97190d9641..7fb5ac63c5d 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh | |||
| @@ -410,8 +410,8 @@ sys_delete_store() | |||
| 410 | _msg "${INF}removing /gnu" | 410 | _msg "${INF}removing /gnu" |
| 411 | rm -rf /gnu | 411 | rm -rf /gnu |
| 412 | 412 | ||
| 413 | _msg "${INF}removing ${ROOT_HOME}/.config/guix" | 413 | _msg "${INF}removing ~root/.config/guix" |
| 414 | rm -rf ${ROOT_HOME}/.config/guix | 414 | rm -rf ~root/.config/guix |
| 415 | } | 415 | } |
| 416 | 416 | ||
| 417 | sys_create_build_user() | 417 | sys_create_build_user() |
| @@ -594,7 +594,7 @@ sys_delete_guix_daemon() | |||
| 594 | ;; | 594 | ;; |
| 595 | NA|*) | 595 | NA|*) |
| 596 | _msg "${ERR}unsupported init system; disable, stop and remove the daemon manually:" | 596 | _msg "${ERR}unsupported init system; disable, stop and remove the daemon manually:" |
| 597 | echo " ${ROOT_HOME}/.config/guix/current/bin/guix-daemon --build-users-group=guixbuild" | 597 | echo " ~root/.config/guix/current/bin/guix-daemon --build-users-group=guixbuild" |
| 598 | ;; | 598 | ;; |
| 599 | esac | 599 | esac |
| 600 | 600 | ||
| @@ -743,9 +743,9 @@ sys_delete_init_profile() | |||
| 743 | 743 | ||
| 744 | sys_delete_user_profiles() | 744 | sys_delete_user_profiles() |
| 745 | { | 745 | { |
| 746 | _msg "${INF}removing ${ROOT_HOME}/.guix-profile" | 746 | _msg "${INF}removing ~root/.guix-profile" |
| 747 | rm -f ${ROOT_HOME}/.guix-profile | 747 | rm -f ~root/.guix-profile |
| 748 | rm -rf ${ROOT_HOME}/.cache/guix | 748 | rm -rf ~root/.cache/guix |
| 749 | 749 | ||
| 750 | _msg "${INF}removing .guix-profile, .cache/guix and .config/guix of all /home users" | 750 | _msg "${INF}removing .guix-profile, .cache/guix and .config/guix of all /home users" |
| 751 | for user in `ls -1 /home`; do | 751 | for user in `ls -1 /home`; do |
