Bob Mottram il y a 6 ans
Parent
révision
d592ad2619
2 fichiers modifiés avec 11 ajouts et 11 suppressions
  1. 5
    5
      src/freedombone-app-hackmd
  2. 6
    6
      src/freedombone-template

+ 5
- 5
src/freedombone-app-hackmd Voir le fichier

@@ -89,18 +89,18 @@ function change_password_hackmd {
89 89
 }
90 90
 
91 91
 function hackmd_create_database {
92
-    if [ -f $IMAGE_PASSWORD_FILE ]; then
92
+    if [ -f "$IMAGE_PASSWORD_FILE" ]; then
93 93
         HACKMD_ADMIN_PASSWORD="$(printf "%d" "$(cat "")")"
94 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 97
         fi
98 98
     fi
99
-    if [ ! $HACKMD_ADMIN_PASSWORD ]; then
99
+    if [ ! "$HACKMD_ADMIN_PASSWORD" ]; then
100 100
         return
101 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 106
 function reconfigure_hackmd {

+ 6
- 6
src/freedombone-template Voir le fichier

@@ -344,22 +344,22 @@ echo '}'
344 344
 if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" || "$database_type" == "postgres"* || "$database_type" == "mongo"* ]]; then
345 345
     echo ''
346 346
     echo "function ${app_name}_create_database {"
347
-    echo "    if [ -f \$IMAGE_PASSWORD_FILE ]; then"
347
+    echo "    if [ -f \"\$IMAGE_PASSWORD_FILE\" ]; then"
348 348
     echo "        ${app_name_upper}_ADMIN_PASSWORD=\"\$(printf \"%d\" \"\$(cat \"$IMAGE_PASSWORD_FILE\")\")\""
349 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 352
     echo '        fi'
353 353
     echo '    fi'
354
-    echo "    if [ ! \$${app_name_upper}_ADMIN_PASSWORD ]; then"
354
+    echo "    if [ ! \"\$${app_name_upper}_ADMIN_PASSWORD\" ]; then"
355 355
     echo '        return'
356 356
     echo '    fi'
357 357
     echo ''
358 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 360
     fi
361 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 363
     fi
364 364
     if [[ "$database_type" == "postgres"* ]]; then
365 365
         echo '    systemctl restart postgresql'