Bob Mottram 7 år sedan
förälder
incheckning
d1a410fa93
1 ändrade filer med 46 tillägg och 17 borttagningar
  1. 46
    17
      src/freedombone-app-bludit

+ 46
- 17
src/freedombone-app-bludit Visa fil

@@ -8,8 +8,6 @@
8 8
 #
9 9
 #                    Freedom in the Cloud
10 10
 #
11
-# Databaseless blogging system
12
-#
13 11
 # License
14 12
 # =======
15 13
 #
@@ -35,7 +33,7 @@ SHOW_ON_ABOUT=1
35 33
 
36 34
 BLUDIT_DOMAIN_NAME=
37 35
 BLUDIT_CODE=
38
-BLUDIT_ONION_PORT=9361
36
+BLUDIT_ONION_PORT=9929
39 37
 BLUDIT_REPO="https://github.com/bludit/bludit"
40 38
 BLUDIT_COMMIT='0e27e31a84421b3e6bd000a77bc89c2dff3c446a'
41 39
 
@@ -95,6 +93,35 @@ function reconfigure_bludit {
95 93
     echo -n ''
96 94
 }
97 95
 
96
+function configure_interactive_bludit {
97
+    while true
98
+    do
99
+        data=$(mktemp 2>/dev/null)
100
+        dialog --backtitle $"Freedombone Control Panel" \
101
+               --title $"bludit" \
102
+               --radiolist $"Choose an operation:" 16 70 3 \
103
+               1 $"Option 1" off \
104
+               2 $"Option 2" off \
105
+               3 $"Exit" on 2> "$data"
106
+        sel=$?
107
+        case $sel in
108
+            1) rm -f "$data"
109
+               return;;
110
+            255) rm -f "$data"
111
+                 return;;
112
+        esac
113
+        case $(cat "$data") in
114
+            1) # call some function for option 1
115
+               ;;
116
+            2) # call some function for option 2
117
+               ;;
118
+            3) rm -f "$data"
119
+               break;;
120
+        esac
121
+        rm -f "$data"
122
+    done
123
+}
124
+
98 125
 function upgrade_bludit {
99 126
     CURR_BLUDIT_COMMIT=$(get_completion_param "bludit commit")
100 127
     if [[ "$CURR_BLUDIT_COMMIT" == "$BLUDIT_COMMIT" ]]; then
@@ -148,6 +175,7 @@ function restore_local_bludit {
148 175
             chown -R www-data:www-data "$bludit_dir"
149 176
             rm -rf $temp_restore_dir
150 177
         fi
178
+
151 179
     fi
152 180
 }
153 181
 
@@ -189,6 +217,7 @@ function restore_remote_bludit {
189 217
             chown -R www-data:www-data "$bludit_dir"
190 218
             rm -rf $temp_restore_dir
191 219
         fi
220
+
192 221
     fi
193 222
 }
194 223
 
@@ -196,6 +225,7 @@ function remove_bludit {
196 225
     nginx_dissite "$BLUDIT_DOMAIN_NAME"
197 226
     remove_certs "$BLUDIT_DOMAIN_NAME"
198 227
 
228
+
199 229
     if [ -d "/var/www/$BLUDIT_DOMAIN_NAME" ]; then
200 230
         rm -rf "/var/www/$BLUDIT_DOMAIN_NAME"
201 231
     fi
@@ -225,20 +255,19 @@ function install_bludit {
225 255
     if [ -d "/var/www/$BLUDIT_DOMAIN_NAME/htdocs" ]; then
226 256
         rm -rf "/var/www/$BLUDIT_DOMAIN_NAME/htdocs"
227 257
     fi
228
-
229
-    if [ -d /repos/bludit ]; then
230
-        mkdir "/var/www/$BLUDIT_DOMAIN_NAME/htdocs"
231
-        cp -r -p /repos/bludit/. "/var/www/$BLUDIT_DOMAIN_NAME/htdocs"
232
-        cd "/var/www/$BLUDIT_DOMAIN_NAME/htdocs" || exit 324687356
233
-        git pull
234
-    else
235
-        git_clone $BLUDIT_REPO "/var/www/$BLUDIT_DOMAIN_NAME/htdocs"
236
-    fi
237
-
238
-    if [ ! -d "/var/www/$BLUDIT_DOMAIN_NAME/htdocs" ]; then
239
-        echo $'Unable to clone bludit repo'
240
-        exit 87525
241
-    fi
258
+      if [ -d /repos/bludit ]; then
259
+          mkdir "/var/www/$BLUDIT_DOMAIN_NAME/htdocs"
260
+          cp -r -p /repos/bludit/. "/var/www/$BLUDIT_DOMAIN_NAME/htdocs"
261
+          cd "/var/www/$BLUDIT_DOMAIN_NAME/htdocs" || exit 324687356
262
+          git pull
263
+      else
264
+          git_clone $BLUDIT_REPO "/var/www/$BLUDIT_DOMAIN_NAME/htdocs"
265
+      fi
266
+
267
+        if [ ! -d "/var/www/$BLUDIT_DOMAIN_NAME/htdocs" ]; then
268
+            echo $'Unable to clone bludit repo'
269
+            exit 87525
270
+        fi
242 271
 
243 272
     cd "/var/www/$BLUDIT_DOMAIN_NAME/htdocs" || exit 36587356
244 273
     git checkout $BLUDIT_COMMIT -b $BLUDIT_COMMIT