Parcourir la source

Don't install hubzilla on onion-only variants

Bob Mottram il y a 8 ans
Parent
révision
e8a6d8fdd7
1 fichiers modifiés avec 47 ajouts et 47 suppressions
  1. 47
    47
      src/freedombone-app-hubzilla

+ 47
- 47
src/freedombone-app-hubzilla Voir le fichier

@@ -137,57 +137,57 @@ function configure_interactive_hubzilla {
137 137
 
138 138
 function install_interactive_hubzilla {
139 139
     if [[ $ONION_ONLY != "no" ]]; then
140
-        HUBZILLA_DOMAIN_NAME='hubzilla.local'
141
-    else
142
-        HUBZILLA_DETAILS_COMPLETE=
143
-        while [ ! $HUBZILLA_DETAILS_COMPLETE ]
144
-        do
145
-            data=$(tempfile 2>/dev/null)
146
-            trap "rm -f $data" 0 1 2 5 15
147
-            if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
148
-                dialog --backtitle $"Freedombone Configuration" \
149
-                       --title $"Hubzilla Configuration" \
150
-                       --form $"\nPlease enter your Hubzilla details.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 14 55 3 \
151
-                       $"Domain:" 1 1 "$(grep 'HUBZILLA_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 33 40 \
152
-                       $"Code:" 2 1 "$(grep 'HUBZILLA_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 33 255 \
153
-                       2> $data
140
+        return
141
+    fi
142
+
143
+    HUBZILLA_DETAILS_COMPLETE=
144
+    while [ ! $HUBZILLA_DETAILS_COMPLETE ]
145
+    do
146
+        data=$(tempfile 2>/dev/null)
147
+        trap "rm -f $data" 0 1 2 5 15
148
+        if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
149
+            dialog --backtitle $"Freedombone Configuration" \
150
+                   --title $"Hubzilla Configuration" \
151
+                   --form $"\nPlease enter your Hubzilla details.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 14 55 3 \
152
+                   $"Domain:" 1 1 "$(grep 'HUBZILLA_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 33 40 \
153
+                   $"Code:" 2 1 "$(grep 'HUBZILLA_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 33 255 \
154
+                   2> $data
155
+        else
156
+            dialog --backtitle $"Freedombone Configuration" \
157
+                   --title $"Hubzilla Configuration" \
158
+                   --form $"\nPlease enter your Hubzilla details\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 11 55 3 \
159
+                   $"Domain:" 1 1 "$(grep 'HUBZILLA_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 33 40 \
160
+                   2> $data
161
+        fi
162
+        sel=$?
163
+        case $sel in
164
+            1) exit 1;;
165
+            255) exit 1;;
166
+        esac
167
+        HUBZILLA_DOMAIN_NAME=$(cat $data | sed -n 1p)
168
+        if [ $HUBZILLA_DOMAIN_NAME ]; then
169
+            TEST_DOMAIN_NAME=$HUBZILLA_DOMAIN_NAME
170
+            validate_domain_name
171
+            if [[ $TEST_DOMAIN_NAME != $HUBZILLA_DOMAIN_NAME ]]; then
172
+                HUBZILLA_DOMAIN_NAME=
173
+                dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
154 174
             else
155
-                dialog --backtitle $"Freedombone Configuration" \
156
-                       --title $"Hubzilla Configuration" \
157
-                       --form $"\nPlease enter your Hubzilla details\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 11 55 3 \
158
-                       $"Domain:" 1 1 "$(grep 'HUBZILLA_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 33 40 \
159
-                       2> $data
160
-            fi
161
-            sel=$?
162
-            case $sel in
163
-                1) exit 1;;
164
-                255) exit 1;;
165
-            esac
166
-            HUBZILLA_DOMAIN_NAME=$(cat $data | sed -n 1p)
167
-            if [ $HUBZILLA_DOMAIN_NAME ]; then
168
-                TEST_DOMAIN_NAME=$HUBZILLA_DOMAIN_NAME
169
-                validate_domain_name
170
-                if [[ $TEST_DOMAIN_NAME != $HUBZILLA_DOMAIN_NAME ]]; then
171
-                    HUBZILLA_DOMAIN_NAME=
172
-                    dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
173
-                else
174
-                    if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
175
-                        HUBZILLA_CODE=$(cat $data | sed -n 2p)
176
-                        validate_freedns_code "$HUBZILLA_CODE"
177
-                        if [ ! $VALID_CODE ]; then
178
-                            HUBZILLA_DOMAIN_NAME=
179
-                        fi
175
+                if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
176
+                    HUBZILLA_CODE=$(cat $data | sed -n 2p)
177
+                    validate_freedns_code "$HUBZILLA_CODE"
178
+                    if [ ! $VALID_CODE ]; then
179
+                        HUBZILLA_DOMAIN_NAME=
180 180
                     fi
181 181
                 fi
182 182
             fi
183
-            if [ $HUBZILLA_DOMAIN_NAME ]; then
184
-                HUBZILLA_DETAILS_COMPLETE="yes"
185
-            fi
186
-        done
187
-        # save the results in the config file
188
-        write_config_param "HUBZILLA_DOMAIN_NAME" "$HUBZILLA_DOMAIN_NAME"
189
-        write_config_param "HUBZILLA_CODE" "$HUBZILLA_CODE"
190
-    fi
183
+        fi
184
+        if [ $HUBZILLA_DOMAIN_NAME ]; then
185
+            HUBZILLA_DETAILS_COMPLETE="yes"
186
+        fi
187
+    done
188
+    # save the results in the config file
189
+    write_config_param "HUBZILLA_DOMAIN_NAME" "$HUBZILLA_DOMAIN_NAME"
190
+    write_config_param "HUBZILLA_CODE" "$HUBZILLA_CODE"
191 191
 }
192 192
 
193 193
 function change_password_hubzilla {