Browse Source

lower case

Bob Mottram 8 years ago
parent
commit
fd31df500e
2 changed files with 23 additions and 23 deletions
  1. 22
    23
      src/freedombone-app-hubzilla
  2. 1
    0
      src/freedombone-utils-upgrade

+ 22
- 23
src/freedombone-app-hubzilla View File

49
         1) return;;
49
         1) return;;
50
         255) return;;
50
         255) return;;
51
     esac
51
     esac
52
-    HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Hubzilla domain" | awk -F ':' '{print $2}')
52
+    HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "hubzilla domain" | awk -F ':' '{print $2}')
53
     if [ ! -d /var/www/$HUBZILLA_DOMAIN_NAME/htdocs ]; then
53
     if [ ! -d /var/www/$HUBZILLA_DOMAIN_NAME/htdocs ]; then
54
         dialog --title $"Renew SSL certificate" \
54
         dialog --title $"Renew SSL certificate" \
55
                --msgbox $"Hubzilla install directory not found" 6 40
55
                --msgbox $"Hubzilla install directory not found" 6 40
65
 }
65
 }
66
 
66
 
67
 function hubzilla_channel_directory_server {
67
 function hubzilla_channel_directory_server {
68
-    if ! grep -q "Hubzilla domain" $COMPLETION_FILE; then
68
+    if ! grep -q "hubzilla domain" $COMPLETION_FILE; then
69
         dialog --title $"Hubzilla channel directory server" \
69
         dialog --title $"Hubzilla channel directory server" \
70
                --msgbox $"Hubzilla is not installed on this system" 6 40
70
                --msgbox $"Hubzilla is not installed on this system" 6 40
71
         return
71
         return
72
     fi
72
     fi
73
-    HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Hubzilla domain" | awk -F ':' '{print $2}')
73
+    HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "hubzilla domain" | awk -F ':' '{print $2}')
74
     if [ ! -d /var/www/$HUBZILLA_DOMAIN_NAME/htdocs ]; then
74
     if [ ! -d /var/www/$HUBZILLA_DOMAIN_NAME/htdocs ]; then
75
         dialog --title $"Hubzilla channel directory server" \
75
         dialog --title $"Hubzilla channel directory server" \
76
                --msgbox $"Hubzilla install directory not found" 6 40
76
                --msgbox $"Hubzilla install directory not found" 6 40
257
     HUBZILLA_PATH=/var/www/$HUBZILLA_DOMAIN_NAME/htdocs
257
     HUBZILLA_PATH=/var/www/$HUBZILLA_DOMAIN_NAME/htdocs
258
 
258
 
259
     function_check set_repo_commit
259
     function_check set_repo_commit
260
-    set_repo_commit $HUBZILLA_PATH "Hubzilla commit" "$HUBZILLA_COMMIT" $HUBZILLA_REPO
261
-    set_repo_commit $HUBZILLA_PATH/addon "Hubzilla addons commit" "$HUBZILLA_ADDONS_COMMIT" $HUBZILLA_ADDONS_REPO
260
+    set_repo_commit $HUBZILLA_PATH "hubzilla commit" "$HUBZILLA_COMMIT" $HUBZILLA_REPO
261
+    set_repo_commit $HUBZILLA_PATH/addon "hubzilla addons commit" "$HUBZILLA_ADDONS_COMMIT" $HUBZILLA_ADDONS_REPO
262
     if [ -d $HUBZILLA_PATH/redmatrix-themes1 ]; then
262
     if [ -d $HUBZILLA_PATH/redmatrix-themes1 ]; then
263
         cd $HUBZILLA_PATH/redmatrix-themes1
263
         cd $HUBZILLA_PATH/redmatrix-themes1
264
         git stash
264
         git stash
269
 }
269
 }
270
 
270
 
271
 function backup_local_hubzilla {
271
 function backup_local_hubzilla {
272
-    if grep -q "Hubzilla domain" $COMPLETION_FILE; then
273
-        HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Hubzilla domain" | awk -F ':' '{print $2}')
272
+    if grep -q "hubzilla domain" $COMPLETION_FILE; then
273
+        HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "hubzilla domain" | awk -F ':' '{print $2}')
274
         hubzilla_path=/var/www/${HUBZILLA_DOMAIN_NAME}/htdocs
274
         hubzilla_path=/var/www/${HUBZILLA_DOMAIN_NAME}/htdocs
275
         if [ -d $hubzilla_path ]; then
275
         if [ -d $hubzilla_path ]; then
276
             echo $"Backing up Hubzilla"
276
             echo $"Backing up Hubzilla"
285
 }
285
 }
286
 
286
 
287
 function restore_local_hubzilla {
287
 function restore_local_hubzilla {
288
-    if ! grep -q "Hubzilla domain" $COMPLETION_FILE; then
288
+    if ! grep -q "hubzilla domain" $COMPLETION_FILE; then
289
         return
289
         return
290
     fi
290
     fi
291
-    HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Hubzilla domain" | awk -F ':' '{print $2}')
291
+    HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "hubzilla domain" | awk -F ':' '{print $2}')
292
     if [ $HUBZILLA_DOMAIN_NAME ]; then
292
     if [ $HUBZILLA_DOMAIN_NAME ]; then
293
         echo $"Restoring Hubzilla"
293
         echo $"Restoring Hubzilla"
294
         temp_restore_dir=/root/temphubzilla
294
         temp_restore_dir=/root/temphubzilla
313
 }
313
 }
314
 
314
 
315
 function backup_remote_hubzilla {
315
 function backup_remote_hubzilla {
316
-    if grep -q "Hubzilla domain" $COMPLETION_FILE; then
317
-        HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Hubzilla domain" | awk -F ':' '{print $2}')
316
+    if grep -q "hubzilla domain" $COMPLETION_FILE; then
317
+        HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "hubzilla domain" | awk -F ':' '{print $2}')
318
         temp_backup_dir=/var/www/${HUBZILLA_DOMAIN_NAME}/htdocs
318
         temp_backup_dir=/var/www/${HUBZILLA_DOMAIN_NAME}/htdocs
319
         if [ -d $temp_backup_dir ]; then
319
         if [ -d $temp_backup_dir ]; then
320
             suspend_site ${HUBZILLA_DOMAIN_NAME}
320
             suspend_site ${HUBZILLA_DOMAIN_NAME}
331
 }
331
 }
332
 
332
 
333
 function restore_remote_hubzilla {
333
 function restore_remote_hubzilla {
334
-    if grep -q "Hubzilla domain" $COMPLETION_FILE; then
334
+    if grep -q "hubzilla domain" $COMPLETION_FILE; then
335
         echo $"Restoring Hubzilla"
335
         echo $"Restoring Hubzilla"
336
-        HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Hubzilla domain" | awk -F ':' '{print $2}')
336
+        HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "hubzilla domain" | awk -F ':' '{print $2}')
337
         function_check restore_database_from_friend
337
         function_check restore_database_from_friend
338
 
338
 
339
         function_check hubzilla_create_database
339
         function_check hubzilla_create_database
359
         return
359
         return
360
     fi
360
     fi
361
     echo $'Removing Hubzilla'
361
     echo $'Removing Hubzilla'
362
-    HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Hubzilla domain" | awk -F ':' '{print $2}')
362
+    HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "hubzilla domain" | awk -F ':' '{print $2}')
363
     nginx_dissite $HUBZILLA_DOMAIN_NAME
363
     nginx_dissite $HUBZILLA_DOMAIN_NAME
364
     if [ -d /var/www/$HUBZILLA_DOMAIN_NAME ]; then
364
     if [ -d /var/www/$HUBZILLA_DOMAIN_NAME ]; then
365
         rm -rf /var/www/$HUBZILLA_DOMAIN_NAME
365
         rm -rf /var/www/$HUBZILLA_DOMAIN_NAME
371
     drop_database hubzilla
371
     drop_database hubzilla
372
     function_check remove_onion_service
372
     function_check remove_onion_service
373
     remove_onion_service hubzilla ${HUBZILLA_ONION_PORT}
373
     remove_onion_service hubzilla ${HUBZILLA_ONION_PORT}
374
-    sed -i '/install_hubzilla/d' $COMPLETION_FILE
375
-    sed -i '/Hubzilla /d' $COMPLETION_FILE
374
+    sed -i '/hubzilla/d' $COMPLETION_FILE
376
     echo $'Hubzilla was removed'
375
     echo $'Hubzilla was removed'
377
 }
376
 }
378
 
377
 
428
         function_check git_clone
427
         function_check git_clone
429
         git_clone $HUBZILLA_REPO hubzilla
428
         git_clone $HUBZILLA_REPO hubzilla
430
         git checkout $HUBZILLA_COMMIT -b $HUBZILLA_COMMIT
429
         git checkout $HUBZILLA_COMMIT -b $HUBZILLA_COMMIT
431
-        if ! grep -q "Hubzilla commit" $COMPLETION_FILE; then
432
-            echo "Hubzilla commit:$HUBZILLA_COMMIT" >> $COMPLETION_FILE
430
+        if ! grep -q "hubzilla commit" $COMPLETION_FILE; then
431
+            echo "hubzilla commit:$HUBZILLA_COMMIT" >> $COMPLETION_FILE
433
         else
432
         else
434
-            sed -i "s/Hubzilla commit.*/Hubzilla commit:$HUBZILLA_COMMIT/g" $COMPLETION_FILE
433
+            sed -i "s/hubzilla commit.*/hubzilla commit:$HUBZILLA_COMMIT/g" $COMPLETION_FILE
435
         fi
434
         fi
436
 
435
 
437
         rm -rf $HUBZILLA_PATH
436
         rm -rf $HUBZILLA_PATH
440
         git_clone $HUBZILLA_ADDONS_REPO $HUBZILLA_PATH/addon
439
         git_clone $HUBZILLA_ADDONS_REPO $HUBZILLA_PATH/addon
441
         cd $HUBZILLA_PATH/addon
440
         cd $HUBZILLA_PATH/addon
442
         git checkout $HUBZILLA_ADDONS_COMMIT -b $HUBZILLA_ADDONS_COMMIT
441
         git checkout $HUBZILLA_ADDONS_COMMIT -b $HUBZILLA_ADDONS_COMMIT
443
-        if ! grep -q "Hubzilla addons commit" $COMPLETION_FILE; then
444
-            echo "Hubzilla addons commit:$HUBZILLA_ADDONS_COMMIT" >> $COMPLETION_FILE
442
+        if ! grep -q "hubzilla addons commit" $COMPLETION_FILE; then
443
+            echo "hubzilla addons commit:$HUBZILLA_ADDONS_COMMIT" >> $COMPLETION_FILE
445
         else
444
         else
446
-            sed -i "s/Hubzilla addons commit.*/Hubzilla addons commit:$HUBZILLA_ADDONS_COMMIT/g" $COMPLETION_FILE
445
+            sed -i "s/hubzilla addons commit.*/hubzilla addons commit:$HUBZILLA_ADDONS_COMMIT/g" $COMPLETION_FILE
447
         fi
446
         fi
448
 
447
 
449
         # some extra themes
448
         # some extra themes
700
 
699
 
701
     ${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$HUBZILLA_DOMAIN_NAME" -g hubzilla --public no
700
     ${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$HUBZILLA_DOMAIN_NAME" -g hubzilla --public no
702
 
701
 
703
-    echo "Hubzilla domain:${HUBZILLA_DOMAIN_NAME}" >> $COMPLETION_FILE
702
+    echo "hubzilla domain:${HUBZILLA_DOMAIN_NAME}" >> $COMPLETION_FILE
704
 }
703
 }
705
 
704
 
706
 # NOTE: deliberately there is no "exit 0"
705
 # NOTE: deliberately there is no "exit 0"

+ 1
- 0
src/freedombone-utils-upgrade View File

73
     sed -i 's|VoIP|mumble|g' $COMPLETION_FILE
73
     sed -i 's|VoIP|mumble|g' $COMPLETION_FILE
74
     sed -i 's|SIP |sip |g' $COMPLETION_FILE
74
     sed -i 's|SIP |sip |g' $COMPLETION_FILE
75
     sed -i 's|Blog |blog |g' $COMPLETION_FILE
75
     sed -i 's|Blog |blog |g' $COMPLETION_FILE
76
+    sed -i 's|Hubzilla |hubzilla |g' $COMPLETION_FILE
76
 
77
 
77
     if [ -f /usr/local/bin/zeronetavahi ]; then
78
     if [ -f /usr/local/bin/zeronetavahi ]; then
78
         rm /usr/local/bin/zeronetavahi
79
         rm /usr/local/bin/zeronetavahi