Explorar el Código

Ensure that clone happens

Bob Mottram hace 7 años
padre
commit
1fbe08647a
Se han modificado 1 ficheros con 11 adiciones y 17 borrados
  1. 11
    17
      src/freedombone-app-edith

+ 11
- 17
src/freedombone-app-edith Ver fichero

@@ -262,25 +262,19 @@ function install_edith {
262 262
 
263 263
     EDITH_ONION_HOSTNAME=$(add_onion_service edith 80 ${EDITH_ONION_PORT})
264 264
 
265
-    if [ ! -d /var/www/$EDITH_DOMAIN_NAME/htdocs ]; then
266
-        mkdir -p /var/www/$EDITH_DOMAIN_NAME/htdocs
265
+    if [ -d /repos/edith ]; then
266
+        mkdir /var/www/$EDITH_DOMAIN_NAME/htdocs
267
+        cp -r -p /repos/edith/. /var/www/$EDITH_DOMAIN_NAME/htdocs
268
+        cd /var/www/$EDITH_DOMAIN_NAME/htdocs
269
+        git pull
270
+    else
271
+        function_check git_clone
272
+        git_clone $EDITH_REPO /var/www/$EDITH_DOMAIN_NAME/htdocs
267 273
     fi
268
-    if [ ! -d /var/www/$EDITH_DOMAIN_NAME/htdocs ]; then
269
-
270
-        if [ -d /repos/edith ]; then
271
-            mkdir /var/www/$EDITH_DOMAIN_NAME/htdocs
272
-            cp -r -p /repos/edith/. /var/www/$EDITH_DOMAIN_NAME/htdocs
273
-            cd /var/www/$EDITH_DOMAIN_NAME/htdocs
274
-            git pull
275
-        else
276
-            function_check git_clone
277
-            git_clone $EDITH_REPO /var/www/$EDITH_DOMAIN_NAME/htdocs
278
-        fi
279 274
 
280
-        if [ ! -d /var/www/$EDITH_DOMAIN_NAME/htdocs ]; then
281
-            echo $'Unable to clone edith repo'
282
-            exit 537593569
283
-        fi
275
+    if [ ! -d /var/www/$EDITH_DOMAIN_NAME/htdocs ]; then
276
+        echo $'Unable to clone edith repo'
277
+        exit 537593569
284 278
     fi
285 279
 
286 280
     cd /var/www/$EDITH_DOMAIN_NAME/htdocs