浏览代码

Move gogs repos back after upgrade

Bob Mottram 7 年前
父节点
当前提交
11e6257545
共有 1 个文件被更改,包括 19 次插入3 次删除
  1. 19
    3
      src/freedombone-app-gogs

+ 19
- 3
src/freedombone-app-gogs 查看文件

162
     GOGS_CONFIG_FILE=$GOGS_CONFIG_PATH/app.ini
162
     GOGS_CONFIG_FILE=$GOGS_CONFIG_PATH/app.ini
163
     cp $GOGS_CONFIG_FILE $INSTALL_DIR/gogs_config.ini
163
     cp $GOGS_CONFIG_FILE $INSTALL_DIR/gogs_config.ini
164
 
164
 
165
+    if [ -d $INSTALL_DIR/gogs-repositories ]; then
166
+        rm -rf $INSTALL_DIR/gogs-repositories
167
+    fi
168
+    if [ -d /home/${GOGS_USERNAME}/gogs-repositories ]; then
169
+        mv /home/${GOGS_USERNAME}/gogs-repositories $INSTALL_DIR
170
+    fi
171
+
165
     gogs_parameters
172
     gogs_parameters
166
     echo "gogs binary upgrade: ${GOGS_BIN}"
173
     echo "gogs binary upgrade: ${GOGS_BIN}"
167
 
174
 
210
         exit 873535
217
         exit 873535
211
     fi
218
     fi
212
     rm $INSTALL_DIR/gogs_config.ini
219
     rm $INSTALL_DIR/gogs_config.ini
220
+    if [ -d /home/${GOGS_USERNAME}/gogs-repositories ]; then
221
+        rm -rf /home/${GOGS_USERNAME}/gogs-repositories
222
+    fi
223
+    if [ -d $INSTALL_DIR/gogs-repositories ]; then
224
+        mv $INSTALL_DIR/gogs-repositories /home/${GOGS_USERNAME}/gogs-repositories
225
+    fi
213
     chown -R ${GOGS_USERNAME}:${GOGS_USERNAME} /home/${GOGS_USERNAME}
226
     chown -R ${GOGS_USERNAME}:${GOGS_USERNAME} /home/${GOGS_USERNAME}
214
 
227
 
215
     sed -i "s|gogs version.*|gogs version:$GOGS_VERSION|g" ${COMPLETION_FILE}
228
     sed -i "s|gogs version.*|gogs version:$GOGS_VERSION|g" ${COMPLETION_FILE}
243
     if ! grep -q "gogs domain" ${COMPLETION_FILE}; then
256
     if ! grep -q "gogs domain" ${COMPLETION_FILE}; then
244
         return
257
         return
245
     fi
258
     fi
246
-    if [ ! -d /home/${GOGS_USERNAME}/gogs-repositories ]; then
247
-        return
248
-    fi
249
 
259
 
250
     if [ ${#GIT_DOMAIN_NAME} -gt 2 ]; then
260
     if [ ${#GIT_DOMAIN_NAME} -gt 2 ]; then
251
         function_check gogs_create_database
261
         function_check gogs_create_database
274
             echo $"Restoring Gogs repos"
284
             echo $"Restoring Gogs repos"
275
             function_check restore_directory_from_usb
285
             function_check restore_directory_from_usb
276
             restore_directory_from_usb ${temp_restore_dir}repos gogsrepos
286
             restore_directory_from_usb ${temp_restore_dir}repos gogsrepos
287
+            if [ ! -d /home/${GOGS_USERNAME}/gogs-repositories ]; then
288
+                mkdir /home/${GOGS_USERNAME}/gogs-repositories
289
+            fi
277
             if [ ! -d ${temp_restore_dir}repos/home/${GOGS_USERNAME}/gogs-repositories ]; then
290
             if [ ! -d ${temp_restore_dir}repos/home/${GOGS_USERNAME}/gogs-repositories ]; then
278
                 cp -r ${temp_restore_dir}repos/home/${GOGS_USERNAME}/gogs-repositories/* /home/${GOGS_USERNAME}/gogs-repositories/
291
                 cp -r ${temp_restore_dir}repos/home/${GOGS_USERNAME}/gogs-repositories/* /home/${GOGS_USERNAME}/gogs-repositories/
279
             else
292
             else
370
             fi
383
             fi
371
             echo $"Restoring Gogs repos"
384
             echo $"Restoring Gogs repos"
372
             restore_directory_from_friend /root/tempgogsrepos gogsrepos
385
             restore_directory_from_friend /root/tempgogsrepos gogsrepos
386
+            if [ ! -d /home/${GOGS_USERNAME}/gogs-repositories ]; then
387
+                mkdir /home/${GOGS_USERNAME}/gogs-repositories
388
+            fi
373
             if [ -d /root/tempgogsrepos/home/${GOGS_USERNAME}/gogs-repositories ]; then
389
             if [ -d /root/tempgogsrepos/home/${GOGS_USERNAME}/gogs-repositories ]; then
374
                 cp -r /root/tempgogsrepos/home/${GOGS_USERNAME}/gogs-repositories/* /home/${GOGS_USERNAME}/gogs-repositories/
390
                 cp -r /root/tempgogsrepos/home/${GOGS_USERNAME}/gogs-repositories/* /home/${GOGS_USERNAME}/gogs-repositories/
375
             else
391
             else