Browse Source

Hubzilla path

Bob Mottram 7 years ago
parent
commit
9351ed6598
1 changed files with 5 additions and 10 deletions
  1. 5
    10
      src/freedombone-app-hubzilla

+ 5
- 10
src/freedombone-app-hubzilla View File

@@ -353,28 +353,23 @@ function install_hubzilla {
353 353
         mkdir /var/www/$HUBZILLA_DOMAIN_NAME
354 354
     fi
355 355
     if [ ! -d $HUBZILLA_PATH ]; then
356
-        mkdir $HUBZILLA_PATH
356
+        mkdir -p $HUBZILLA_PATH
357 357
     fi
358 358
 
359 359
     if [ ! -f $HUBZILLA_PATH/index.php ]; then
360
-        cd $INSTALL_DIR
361
-
362 360
         if [ -d /repos/hubzilla ]; then
363
-            mkdir hubzilla
364
-            cp -r -p /repos/hubzilla/. hubzilla
365
-            cd hubzilla
361
+            mkdir $HUBZILLA_PATH
362
+            cp -r -p /repos/hubzilla/. $HUBZILLA_PATH
363
+            cd $HUBZILLA_PATH
366 364
             git pull
367 365
         else
368 366
             function_check git_clone
369
-            git_clone $HUBZILLA_REPO hubzilla
367
+            git_clone $HUBZILLA_REPO $HUBZILLA_PATH
370 368
         fi
371 369
 
372 370
         git checkout $HUBZILLA_COMMIT -b $HUBZILLA_COMMIT
373 371
         set_completion_param "hubzilla commit" "$HUBZILLA_COMMIT"
374 372
 
375
-        rm -rf $HUBZILLA_PATH
376
-        mv hubzilla $HUBZILLA_PATH
377
-
378 373
         if [ -d /repos/hubzilla-addons ]; then
379 374
             mkdir $HUBZILLA_PATH/addon
380 375
             cp -r -p /repos/hubzilla-addons/. $HUBZILLA_PATH/addon