Browse Source

guix paths

Bob Mottram 8 years ago
parent
commit
30e62efa37
1 changed files with 8 additions and 9 deletions
  1. 8
    9
      src/freedombone-utils-guile

+ 8
- 9
src/freedombone-utils-guile View File

174
         echo $'guix directory var/guix not found'
174
         echo $'guix directory var/guix not found'
175
         exit 8726325
175
         exit 8726325
176
     fi
176
     fi
177
-    mv var/guix /var/
177
+    if [ -d /var/guix ]; then
178
+        rm -rf /var/guix
179
+    fi
180
+    mv $INSTALL_DIR/guix/var/guix /var/
178
     if [ ! -d gnu ]; then
181
     if [ ! -d gnu ]; then
179
         echo $'guix gnu directory not found'
182
         echo $'guix gnu directory not found'
180
         exit 743383235
183
         exit 743383235
181
     fi
184
     fi
185
+    if [ -d /gnu ]; then
186
+        rm -rf /gnu
187
+    fi
182
     mv gnu /
188
     mv gnu /
183
 
189
 
184
     ln -sf /var/guix/profiles/per-user/root/guix-profile /root/.guix-profile
190
     ln -sf /var/guix/profiles/per-user/root/guix-profile /root/.guix-profile
195
                 guixbuilder$i;
201
                 guixbuilder$i;
196
     done
202
     done
197
 
203
 
198
-    GUIX_DAEMON=$(find $INSTALL_DIR/guix -name guix-daemon.service)
204
+    GUIX_DAEMON=$(find /var/guix -name guix-daemon.service)
199
     if [ ! -f $GUIX_DAEMON ]; then
205
     if [ ! -f $GUIX_DAEMON ]; then
200
         echo $"$GUIX_DAEMON"
206
         echo $"$GUIX_DAEMON"
201
         echo $'No guix systemd daemon found'
207
         echo $'No guix systemd daemon found'
214
     if [ ! -d /usr/local/share/info ]; then
220
     if [ ! -d /usr/local/share/info ]; then
215
         mkdir -p /usr/local/share/info
221
         mkdir -p /usr/local/share/info
216
     fi
222
     fi
217
-    cd /usr/local/share/info
218
-    if [ ! -d /var/guix/profiles/per-user/root/guix-profile/share/info ]; then
219
-        echo $'Directory not found /var/guix/profiles/per-user/root/guix-profile/share/info'
220
-        exit 7835202
221
-    fi
222
-    for i in /var/guix/profiles/per-user/root/guix-profile/share/info/* ;
223
-    do ln -s $i ; done
224
 
223
 
225
     install_guix_user /root
224
     install_guix_user /root
226
     install_guix_user /etc/skel
225
     install_guix_user /etc/skel