Quellcode durchsuchen

Ensure that a domain is provided before removing

Bob Mottram vor 8 Jahren
Ursprung
Commit
5025c5c227

+ 3
- 0
src/freedombone-app-blog Datei anzeigen

@@ -332,6 +332,9 @@ function remove_blog {
332 332
     if [[ $(app_is_installed blog) == "0" ]]; then
333 333
         return
334 334
     fi
335
+    if [ ${#FULLBLOG_DOMAIN_NAME} -eq 0 ]; then
336
+        return
337
+    fi
335 338
 
336 339
     if grep -q "FULLBLOG_DOMAIN_NAME" $CONFIGURATION_FILE; then
337 340
         FULLBLOG_DOMAIN_NAME=$(grep "FULLBLOG_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')

+ 3
- 0
src/freedombone-app-gnusocial Datei anzeigen

@@ -350,6 +350,9 @@ function remove_gnusocial {
350 350
     if [[ $(app_is_installed gnusocial) == "0" ]]; then
351 351
         return
352 352
     fi
353
+    if [ ${#MICROBLOG_DOMAIN_NAME} -eq 0 ]; then
354
+        return
355
+    fi
353 356
     if grep -q "MICROBLOG_DOMAIN_NAME" $CONFIGURATION_FILE; then
354 357
         MICROBLOG_DOMAIN_NAME=$(grep "MICROBLOG_DOMAIN_NAME" $CONFIGURATION_FILE | head -n 1 | awk -F '=' '{print $2}')
355 358
     fi

+ 3
- 0
src/freedombone-app-gogs Datei anzeigen

@@ -380,6 +380,9 @@ function remove_gogs {
380 380
         return
381 381
     fi
382 382
 
383
+    if [ ${#GIT_DOMAIN_NAME} -eq 0 ]; then
384
+        return
385
+    fi
383 386
     systemctl stop gogs
384 387
     systemctl disable gogs
385 388
     nginx_dissite ${GIT_DOMAIN_NAME}

+ 3
- 0
src/freedombone-app-hubzilla Datei anzeigen

@@ -319,6 +319,9 @@ function remove_hubzilla {
319 319
     if [[ $(app_is_installed hubzilla) == "0" ]]; then
320 320
         return
321 321
     fi
322
+    if [ ${#HUBZILLA_DOMAIN_NAME} -eq 0 ]; then
323
+        return
324
+    fi
322 325
     echo $'Removing Hubzilla'
323 326
     nginx_dissite $HUBZILLA_DOMAIN_NAME
324 327
     if [ -d /var/www/$HUBZILLA_DOMAIN_NAME ]; then

+ 4
- 0
src/freedombone-app-rss Datei anzeigen

@@ -246,6 +246,10 @@ function remove_rss {
246 246
     if [[ $(app_is_installed rss) == "0" ]]; then
247 247
         return
248 248
     fi
249
+    if [ ${#RSS_READER_DOMAIN_NAME} -eq 0 ]; then
250
+        return
251
+    fi
252
+
249 253
     nginx_dissite $RSS_READER_DOMAIN_NAME
250 254
     function_check remove_onion_service
251 255
     remove_onion_service ttrss ${RSS_READER_ONION_PORT} ${RSS_MOBILE_READER_ONION_PORT}

+ 2
- 2
src/freedombone-app-wiki Datei anzeigen

@@ -212,8 +212,8 @@ function remove_wiki {
212 212
     if [[ $(app_is_installed wiki) == "0" ]]; then
213 213
         return
214 214
     fi
215
-    if grep -q "WIKI_DOMAIN_NAME" $CONFIGURATION_FILE; then
216
-        WIKI_DOMAIN_NAME=$(grep "WIKI_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
215
+    if [ ${#WIKI_DOMAIN_NAME} -eq 0 ]; then
216
+        return
217 217
     fi
218 218
     function_check remove_onion_service
219 219
     remove_onion_service wiki ${WIKI_ONION_PORT}