From 30e62efa37d13667c9069358d48b49ea9ce39437 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 26 Aug 2017 19:08:41 +0100
Subject: [PATCH] guix paths
---
src/freedombone-utils-guile | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/freedombone-utils-guile b/src/freedombone-utils-guile
index 0d9aba648..df241fc51 100755
--- a/src/freedombone-utils-guile
+++ b/src/freedombone-utils-guile
@@ -174,11 +174,17 @@ function install_guix {
echo $'guix directory var/guix not found'
exit 8726325
fi
- mv var/guix /var/
+ if [ -d /var/guix ]; then
+ rm -rf /var/guix
+ fi
+ mv $INSTALL_DIR/guix/var/guix /var/
if [ ! -d gnu ]; then
echo $'guix gnu directory not found'
exit 743383235
fi
+ if [ -d /gnu ]; then
+ rm -rf /gnu
+ fi
mv gnu /
ln -sf /var/guix/profiles/per-user/root/guix-profile /root/.guix-profile
@@ -195,7 +201,7 @@ function install_guix {
guixbuilder$i;
done
- GUIX_DAEMON=$(find $INSTALL_DIR/guix -name guix-daemon.service)
+ GUIX_DAEMON=$(find /var/guix -name guix-daemon.service)
if [ ! -f $GUIX_DAEMON ]; then
echo $"$GUIX_DAEMON"
echo $'No guix systemd daemon found'
@@ -214,13 +220,6 @@ function install_guix {
if [ ! -d /usr/local/share/info ]; then
mkdir -p /usr/local/share/info
fi
- cd /usr/local/share/info
- if [ ! -d /var/guix/profiles/per-user/root/guix-profile/share/info ]; then
- echo $'Directory not found /var/guix/profiles/per-user/root/guix-profile/share/info'
- exit 7835202
- fi
- for i in /var/guix/profiles/per-user/root/guix-profile/share/info/* ;
- do ln -s $i ; done
install_guix_user /root
install_guix_user /etc/skel
--
GitLab