[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/09: guix-install.sh: Replace `ROOT_HOME` with `~root`
From: |
guix-commits |
Subject: |
04/09: guix-install.sh: Replace `ROOT_HOME` with `~root` |
Date: |
Thu, 14 Nov 2024 09:54:23 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 8edd08116452bf6ecd3eff7a7f98f9b0991097df
Author: David Boilleau <david_boilleau@gmx.fr>
AuthorDate: Fri Nov 8 15:10:23 2024 +0100
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>
---
etc/guix-install.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index e97190d964..7fb5ac63c5 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -410,8 +410,8 @@ sys_delete_store()
_msg "${INF}removing /gnu"
rm -rf /gnu
- _msg "${INF}removing ${ROOT_HOME}/.config/guix"
- rm -rf ${ROOT_HOME}/.config/guix
+ _msg "${INF}removing ~root/.config/guix"
+ rm -rf ~root/.config/guix
}
sys_create_build_user()
@@ -594,7 +594,7 @@ sys_delete_guix_daemon()
;;
NA|*)
_msg "${ERR}unsupported init system; disable, stop and remove the
daemon manually:"
- echo " ${ROOT_HOME}/.config/guix/current/bin/guix-daemon
--build-users-group=guixbuild"
+ echo " ~root/.config/guix/current/bin/guix-daemon
--build-users-group=guixbuild"
;;
esac
@@ -743,9 +743,9 @@ sys_delete_init_profile()
sys_delete_user_profiles()
{
- _msg "${INF}removing ${ROOT_HOME}/.guix-profile"
- rm -f ${ROOT_HOME}/.guix-profile
- rm -rf ${ROOT_HOME}/.cache/guix
+ _msg "${INF}removing ~root/.guix-profile"
+ rm -f ~root/.guix-profile
+ rm -rf ~root/.cache/guix
_msg "${INF}removing .guix-profile, .cache/guix and .config/guix of all
/home users"
for user in `ls -1 /home`; do
- branch master updated (b654587cd9 -> abc3eb3319), guix-commits, 2024/11/14
- 04/09: guix-install.sh: Replace `ROOT_HOME` with `~root`,
guix-commits <=
- 07/09: gnu: postgresql-10: Replace deprecated dependency., guix-commits, 2024/11/14
- 02/09: gnu: guix-jupyter: Update to 0.3.0., guix-commits, 2024/11/14
- 03/09: guix-install.sh: Test if gnu-store.mount exists before removing the unit, guix-commits, 2024/11/14
- 01/09: describe: Add hyperlinks for codeberg.org commits., guix-commits, 2024/11/14
- 05/09: guix-install.sh: Run the uninstall even if already partially done, guix-commits, 2024/11/14
- 08/09: gnu: mumble: Update to 1.5.634, fix aarch64 build., guix-commits, 2024/11/14
- 09/09: import: hackage: Support updating to a specific version., guix-commits, 2024/11/14
- 06/09: gnu: python-crontab: Fix failing tests, guix-commits, 2024/11/14