Skip to content
Snippets Groups Projects
Commit 30e62efa authored by Bob Mottram's avatar Bob Mottram
Browse files

guix paths

parent 88f80ed6
No related branches found
No related tags found
No related merge requests found
...@@ -174,11 +174,17 @@ function install_guix { ...@@ -174,11 +174,17 @@ function install_guix {
echo $'guix directory var/guix not found' echo $'guix directory var/guix not found'
exit 8726325 exit 8726325
fi 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 if [ ! -d gnu ]; then
echo $'guix gnu directory not found' echo $'guix gnu directory not found'
exit 743383235 exit 743383235
fi fi
if [ -d /gnu ]; then
rm -rf /gnu
fi
mv gnu / mv gnu /
ln -sf /var/guix/profiles/per-user/root/guix-profile /root/.guix-profile ln -sf /var/guix/profiles/per-user/root/guix-profile /root/.guix-profile
...@@ -195,7 +201,7 @@ function install_guix { ...@@ -195,7 +201,7 @@ function install_guix {
guixbuilder$i; guixbuilder$i;
done 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 if [ ! -f $GUIX_DAEMON ]; then
echo $"$GUIX_DAEMON" echo $"$GUIX_DAEMON"
echo $'No guix systemd daemon found' echo $'No guix systemd daemon found'
...@@ -214,13 +220,6 @@ function install_guix { ...@@ -214,13 +220,6 @@ function install_guix {
if [ ! -d /usr/local/share/info ]; then if [ ! -d /usr/local/share/info ]; then
mkdir -p /usr/local/share/info mkdir -p /usr/local/share/info
fi 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 /root
install_guix_user /etc/skel install_guix_user /etc/skel
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment