diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-11-08 09:06:14 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-11-08 09:06:14 +0200 |
| commit | 1c94392a13cbdf87e03a644633eb775bf45694a1 (patch) | |
| tree | 74f11038dfc5f9d9db06660b1087253b28c5434f /etc | |
| parent | dd87bbb2b78b279248aaff15c0706fcd6d8cd7bb (diff) | |
| parent | 9d25ee30b188f9202cc14f7cd25ba8a1c3ec1a72 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates-frozen
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/guix-install.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh index b0d4a8b95e..cd1a1c34c1 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -345,11 +345,11 @@ sys_create_store() mv "${tmp_path}/gnu" / _msg "${INF}Linking the root user's profile" - mkdir -p "~root/.config/guix" + mkdir -p ~root/.config/guix ln -sf /var/guix/profiles/per-user/root/current-guix \ - "~root/.config/guix/current" + ~root/.config/guix/current - GUIX_PROFILE="~root/.config/guix/current" + GUIX_PROFILE=~root/.config/guix/current # shellcheck disable=SC1090 source "${GUIX_PROFILE}/etc/profile" _msg "${PAS}activated root profile at ${GUIX_PROFILE}" @@ -405,7 +405,7 @@ sys_enable_guix_daemon() case "$INIT_SYS" in upstart) { initctl reload-configuration; - cp "~root/.config/guix/current/lib/upstart/system/guix-daemon.conf" \ + cp ~root/.config/guix/current/lib/upstart/system/guix-daemon.conf \ /etc/init/ && configure_substitute_discovery /etc/init/guix-daemon.conf && start guix-daemon; } && @@ -415,15 +415,15 @@ sys_enable_guix_daemon() { # systemd .mount units must be named after the target directory. # Here we assume a hard-coded name of /gnu/store. # XXX Work around <https://issues.guix.gnu.org/41356> until next release. - if [ -f "~root/.config/guix/current/lib/systemd/system/gnu-store.mount" ]; then - cp "~root/.config/guix/current/lib/systemd/system/gnu-store.mount" \ + if [ -f ~root/.config/guix/current/lib/systemd/system/gnu-store.mount ]; then + cp ~root/.config/guix/current/lib/systemd/system/gnu-store.mount \ /etc/systemd/system/; chmod 664 /etc/systemd/system/gnu-store.mount; systemctl daemon-reload && systemctl enable gnu-store.mount; fi - cp "~root/.config/guix/current/lib/systemd/system/guix-daemon.service" \ + cp ~root/.config/guix/current/lib/systemd/system/guix-daemon.service \ /etc/systemd/system/; chmod 664 /etc/systemd/system/guix-daemon.service; @@ -447,7 +447,7 @@ sys_enable_guix_daemon() ;; sysv-init) { mkdir -p /etc/init.d; - cp "~root/.config/guix/current/etc/init.d/guix-daemon" \ + cp ~root/.config/guix/current/etc/init.d/guix-daemon \ /etc/init.d/guix-daemon; chmod 775 /etc/init.d/guix-daemon; @@ -460,7 +460,7 @@ sys_enable_guix_daemon() ;; openrc) { mkdir -p /etc/init.d; - cp "~root/.config/guix/current/etc/openrc/guix-daemon" \ + cp ~root/.config/guix/current/etc/openrc/guix-daemon \ /etc/init.d/guix-daemon; chmod 775 /etc/init.d/guix-daemon; @@ -492,7 +492,7 @@ sys_authorize_build_farms() if prompt_yes_no "Permit downloading pre-built package binaries from the \ project's build farm? (yes/no)"; then guix archive --authorize \ - < "~root/.config/guix/current/share/guix/ci.guix.gnu.org.pub" \ + < ~root/.config/guix/current/share/guix/ci.guix.gnu.org.pub \ && _msg "${PAS}Authorized public key for ci.guix.gnu.org" else _msg "${INF}Skipped authorizing build farm public keys" |