瀏覽代碼

Fix site details with title

Bob Mottram 8 年之前
父節點
當前提交
3263fb3fe6
共有 1 個檔案被更改,包括 22 行新增18 行删除
  1. 22
    18
      src/freedombone-utils-interactive

+ 22
- 18
src/freedombone-utils-interactive 查看文件

@@ -174,9 +174,11 @@ function interactive_site_details_with_title {
174 174
     SITE_BACKTITLE=$"Freedombone Configuration"
175 175
     SITE_CONFIG_TITLE=$"${site_name^} Configuration"
176 176
     SITE_FORM_TEXT=$"\nPlease enter your ${site_name^} details.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:"
177
-    SITE_TITLE=$2
178
-    SITE_DOMAIN_NAME=$3
179
-    SITE_CODE=$4
177
+
178
+    SITE_TITLE=
179
+    SITE_DOMAIN_NAME=
180
+    SITE_CODE=
181
+
180 182
     SITE_DETAILS_COMPLETE=
181 183
     while [ ! $SITE_DETAILS_COMPLETE ]
182 184
     do
@@ -203,37 +205,39 @@ function interactive_site_details_with_title {
203 205
             1) exit 1;;
204 206
             255) exit 1;;
205 207
         esac
206
-        ${!SITE_TITLE}=$(cat $data | sed -n 1p)
207
-        ${!SITE_DOMAIN_NAME}=$(cat $data | sed -n 2p)
208
-        if [ ${!SITE_DOMAIN_NAME} ]; then
209
-            TEST_DOMAIN_NAME=${!SITE_DOMAIN_NAME}
208
+        SITE_TITLE=$(cat $data | sed -n 1p)
209
+        SITE_DOMAIN_NAME=$(cat $data | sed -n 2p)
210
+        site_domain_name_str="$SITE_DOMAIN_NAME"
211
+        if [ ${#site_domain_name_str} -gt 1 ]; then
212
+            TEST_DOMAIN_NAME="$SITE_DOMAIN_NAME"
210 213
             validate_domain_name
211
-            if [[ $TEST_DOMAIN_NAME != ${!SITE_DOMAIN_NAME} ]]; then
212
-                ${!SITE_DOMAIN_NAME}=
214
+            if [[ "$TEST_DOMAIN_NAME" != "${SITE_DOMAIN_NAME}" ]]; then
215
+                SITE_DOMAIN_NAME=
213 216
                 dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
214 217
             else
215 218
                 if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
216
-                    ${!SITE_CODE}=$(cat $data | sed -n 3p)
217
-                    validate_freedns_code "${!SITE_CODE}"
219
+                    SITE_CODE=$(cat $data | sed -n 3p)
220
+                    validate_freedns_code "${SITE_CODE}"
218 221
                     if [ ! $VALID_CODE ]; then
219
-                        ${!SITE_DOMAIN_NAME}=
222
+                        SITE_DOMAIN_NAME=
220 223
                     fi
221 224
                 fi
222 225
             fi
223 226
         fi
224
-        site_title_str="${!SITE_TITLE}"
227
+        site_title_str="$SITE_TITLE"
225 228
         if [ ${#site_title_str} -gt 0 ]; then
226
-            if [ ${!SITE_DOMAIN_NAME} ]; then
229
+            if [ ${SITE_DOMAIN_NAME} ]; then
227 230
                 SITE_DETAILS_COMPLETE="yes"
228 231
             fi
229 232
         fi
230 233
     done
231 234
 
232 235
     # save the results in the config file
233
-    write_config_param "$SITE_TITLE" "${!SITE_TITLE}"
234
-    write_config_param "$SITE_DOMAIN_NAME" "${!SITE_DOMAIN_NAME}"
235
-    if [ ${!SITE_CODE} ]; then
236
-        write_config_param "$SITE_CODE" "${!SITE_CODE}"
236
+    write_config_param "$2" "${!SITE_TITLE}"
237
+    write_config_param "$3" "${!SITE_DOMAIN_NAME}"
238
+    site_code_str="$SITE_CODE"
239
+    if [ ${#site_code_str} -gt 1 ]; then
240
+        write_config_param "$4" "${!SITE_CODE}"
237 241
     fi
238 242
 }
239 243