瀏覽代碼

Extra quotes

Bob Mottram 7 年之前
父節點
當前提交
d592ad2619
共有 2 個檔案被更改,包括 11 行新增11 行删除
  1. 5
    5
      src/freedombone-app-hackmd
  2. 6
    6
      src/freedombone-template

+ 5
- 5
src/freedombone-app-hackmd 查看文件

89
 }
89
 }
90
 
90
 
91
 function hackmd_create_database {
91
 function hackmd_create_database {
92
-    if [ -f $IMAGE_PASSWORD_FILE ]; then
92
+    if [ -f "$IMAGE_PASSWORD_FILE" ]; then
93
         HACKMD_ADMIN_PASSWORD="$(printf "%d" "$(cat "")")"
93
         HACKMD_ADMIN_PASSWORD="$(printf "%d" "$(cat "")")"
94
     else
94
     else
95
-        if [ ! $HACKMD_ADMIN_PASSWORD ]; then
96
-            HACKMD_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
95
+        if [ ! "$HACKMD_ADMIN_PASSWORD" ]; then
96
+            HACKMD_ADMIN_PASSWORD=$(create_password "${MINIMUM_PASSWORD_LENGTH}")
97
         fi
97
         fi
98
     fi
98
     fi
99
-    if [ ! $HACKMD_ADMIN_PASSWORD ]; then
99
+    if [ ! "$HACKMD_ADMIN_PASSWORD" ]; then
100
         return
100
         return
101
     fi
101
     fi
102
 
102
 
103
-    create_database hackmd "$HACKMD_ADMIN_PASSWORD" $MY_USERNAME
103
+    create_database hackmd "$HACKMD_ADMIN_PASSWORD" "$MY_USERNAME"
104
 }
104
 }
105
 
105
 
106
 function reconfigure_hackmd {
106
 function reconfigure_hackmd {

+ 6
- 6
src/freedombone-template 查看文件

344
 if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" || "$database_type" == "postgres"* || "$database_type" == "mongo"* ]]; then
344
 if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" || "$database_type" == "postgres"* || "$database_type" == "mongo"* ]]; then
345
     echo ''
345
     echo ''
346
     echo "function ${app_name}_create_database {"
346
     echo "function ${app_name}_create_database {"
347
-    echo "    if [ -f \$IMAGE_PASSWORD_FILE ]; then"
347
+    echo "    if [ -f \"\$IMAGE_PASSWORD_FILE\" ]; then"
348
     echo "        ${app_name_upper}_ADMIN_PASSWORD=\"\$(printf \"%d\" \"\$(cat \"$IMAGE_PASSWORD_FILE\")\")\""
348
     echo "        ${app_name_upper}_ADMIN_PASSWORD=\"\$(printf \"%d\" \"\$(cat \"$IMAGE_PASSWORD_FILE\")\")\""
349
     echo '    else'
349
     echo '    else'
350
-    echo "        if [ ! \$${app_name_upper}_ADMIN_PASSWORD ]; then"
351
-    echo "            ${app_name_upper}_ADMIN_PASSWORD=\"\$(create_password \${MINIMUM_PASSWORD_LENGTH})\""
350
+    echo "        if [ ! \"\$${app_name_upper}_ADMIN_PASSWORD\" ]; then"
351
+    echo "            ${app_name_upper}_ADMIN_PASSWORD=\$(create_password \"\${MINIMUM_PASSWORD_LENGTH}\")"
352
     echo '        fi'
352
     echo '        fi'
353
     echo '    fi'
353
     echo '    fi'
354
-    echo "    if [ ! \$${app_name_upper}_ADMIN_PASSWORD ]; then"
354
+    echo "    if [ ! \"\$${app_name_upper}_ADMIN_PASSWORD\" ]; then"
355
     echo '        return'
355
     echo '        return'
356
     echo '    fi'
356
     echo '    fi'
357
     echo ''
357
     echo ''
358
     if [[ "$database_type" = "mysql" || "$database_type" = "mariadb" ]]; then
358
     if [[ "$database_type" = "mysql" || "$database_type" = "mariadb" ]]; then
359
-        echo "    create_database ${app_name} \"\$${app_name_upper}_ADMIN_PASSWORD\" \$MY_USERNAME"
359
+        echo "    create_database ${app_name} \"\$${app_name_upper}_ADMIN_PASSWORD\" \"\$MY_USERNAME\""
360
     fi
360
     fi
361
     if [[ "$database_type" = "mongo"* ]]; then
361
     if [[ "$database_type" = "mongo"* ]]; then
362
-        echo "    create_database_mongodb ${app_name} \"\$${app_name_upper}_ADMIN_PASSWORD\" \$MY_USERNAME"
362
+        echo "    create_database_mongodb ${app_name} \"\$${app_name_upper}_ADMIN_PASSWORD\" \"\$MY_USERNAME\""
363
     fi
363
     fi
364
     if [[ "$database_type" == "postgres"* ]]; then
364
     if [[ "$database_type" == "postgres"* ]]; then
365
         echo '    systemctl restart postgresql'
365
         echo '    systemctl restart postgresql'