Bob Mottram 8 лет назад
Родитель
Сommit
30e62efa37
1 измененных файлов: 8 добавлений и 9 удалений
  1. 8
    9
      src/freedombone-utils-guile

+ 8
- 9
src/freedombone-utils-guile Просмотреть файл

@@ -174,11 +174,17 @@ function install_guix {
174 174
         echo $'guix directory var/guix not found'
175 175
         exit 8726325
176 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 181
     if [ ! -d gnu ]; then
179 182
         echo $'guix gnu directory not found'
180 183
         exit 743383235
181 184
     fi
185
+    if [ -d /gnu ]; then
186
+        rm -rf /gnu
187
+    fi
182 188
     mv gnu /
183 189
 
184 190
     ln -sf /var/guix/profiles/per-user/root/guix-profile /root/.guix-profile
@@ -195,7 +201,7 @@ function install_guix {
195 201
                 guixbuilder$i;
196 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 205
     if [ ! -f $GUIX_DAEMON ]; then
200 206
         echo $"$GUIX_DAEMON"
201 207
         echo $'No guix systemd daemon found'
@@ -214,13 +220,6 @@ function install_guix {
214 220
     if [ ! -d /usr/local/share/info ]; then
215 221
         mkdir -p /usr/local/share/info
216 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 224
     install_guix_user /root
226 225
     install_guix_user /etc/skel