Browse Source

Check directories

Bob Mottram 8 years ago
parent
commit
ad4b4c61fd
1 changed files with 9 additions and 6 deletions
  1. 9
    6
      src/freedombone-app-keyserver

+ 9
- 6
src/freedombone-app-keyserver View File

@@ -243,12 +243,11 @@ function install_keyserver {
243 243
         cd $INSTALL_DIR/keyserver
244 244
         git pull
245 245
     else
246
-        if [ -d $INSTALL_DIR/keyserver ]; then
247
-            cd $INSTALL_DIR/keyserver
248
-            pull
249
-        else
250
-            git_clone $KEYSERVER_SKS_REPO $INSTALL_DIR/keyserver
251
-        fi
246
+        git_clone $KEYSERVER_SKS_REPO keyserver
247
+    fi
248
+    if [ ! -d $INSTALL_DIR/keyserver ]; then
249
+        echo $"$INSTALL_DIR/keyserver not found"
250
+        exit 835274
252 251
     fi
253 252
 
254 253
     cd $INSTALL_DIR/keyserver
@@ -268,6 +267,10 @@ function install_keyserver {
268 267
     else
269 268
         git_clone $KEYSERVER_WEB_REPO htdocs
270 269
     fi
270
+    if [ ! -d /var/www/$KEYSERVER_DOMAIN_NAME/htdocs ]; then
271
+        echo $"/var/www/$KEYSERVER_DOMAIN_NAME/htdocs not found"
272
+        exit 6539230
273
+    fi
271 274
 
272 275
     cd /var/www/$KEYSERVER_DOMAIN_NAME/htdocs
273 276
     git checkout $KEYSERVER_WEB_COMMIT -b $KEYSERVER_WEB_COMMIT