quotes

src/freedombone-app-lychee

@@ -421,22 +421,22 @@ function lychee_run_installation {
     sed -i 's|?|lychee_settings|g' settings_table.sql
     sed -i 's|?|lychee_settings|g' settings_content.sql
     initialise_database lychee settings_table.sql
-    run_query lychee "$(cat settings_content.sql)"
+    run_query_with_output lychee "$(cat settings_content.sql)"
     sed -i 's|?|lychee_albums|g' albums_table.sql
     initialise_database lychee albums_table.sql
 
     # populate settings fields
     lychee_identifier=$(php -r "echo md5(microtime(true));")
     # shellcheck disable=SC2006
-    run_query lychee "UPDATE `lychee_settings` SET `value` = '$lychee_identifier' WHERE `key` = 'identifier' LIMIT 1"
+    run_query_with_output lychee "UPDATE `lychee_settings` SET `value` = '$lychee_identifier' WHERE `key` = 'identifier' LIMIT 1"
     # shellcheck disable=SC2006
-    run_query lychee "UPDATE `lychee_settings` SET `value` = '$LYCHEE_VERSION' WHERE `key` = 'version'"
+    run_query_with_output lychee "UPDATE `lychee_settings` SET `value` = '$LYCHEE_VERSION' WHERE `key` = 'version'"
     username_encrypted=$(lychee_hashed_string "root")
     # shellcheck disable=SC2006
-    run_query lychee "UPDATE `lychee_settings` SET `value` = '$username_encrypted' WHERE `key` = 'username'"
+    run_query_with_output lychee "UPDATE `lychee_settings` SET `value` = '$username_encrypted' WHERE `key` = 'username'"
     password_encrypted=$(lychee_hashed_string "$LYCHEE_ADMIN_PASSWORD")
     # shellcheck disable=SC2006
-    run_query lychee "UPDATE `lychee_settings` SET `value` = '$password_encrypted' WHERE `key` = 'password'"
+    run_query_with_output lychee "UPDATE `lychee_settings` SET `value` = '$password_encrypted' WHERE `key` = 'password'"
 }
 
 function lychee_create_config {

src/freedombone-utils-database

@@ -48,7 +48,7 @@ function keep_database_running {
 }
 
 function remove_backup_database_local {
-    database_name=$1
+    database_name="$1"
 
     sed -i "/# Backup the ${database_name} database/,/# End of ${database_name} database backup/d" /usr/bin/backupdatabases
     sed -i "/# Backup ${database_name}/,/# End of backup for ${database_name}/d" /etc/cron.weekly/backupdatabasesweekly
@@ -59,7 +59,7 @@ function remove_backup_database_local {
 function backup_database_local {
     # Makes local backups of databases which can then be automatically rolled
     # back if corruption is detected
-    database_name=$1
+    database_name="$1"
 
     backup_databases_script=/usr/bin/backupdatabases
     if ! grep -q "# Check database daemon" /usr/bin/backupdatabases; then
@@ -318,8 +318,8 @@ quit" > "$INSTALL_DIR/batch.sql"
 }
 
 function initialise_database {
-    database_name=$1
-    database_file=$2
+    database_name="$1"
+    database_file="$2"
     keep_database_running
     mysql -u root --password="$MARIADB_PASSWORD" -D "$database_name" < "$database_file"
     # shellcheck disable=SC2181
@@ -329,15 +329,15 @@ function initialise_database {
 }
 
 function run_query {
-    database_name=$1
-    database_query=$2
+    database_name="$1"
+    database_query="$2"
     keep_database_running
     mysql -u root --password="$MARIADB_PASSWORD" -e "$database_query" "$database_name"
 }
 
 function run_query_root {
-    database_name=$1
-    database_query=$2
+    database_name="$1"
+    database_query="$2"
     keep_database_running
     mysql -e "$database_query" "$database_name"
 }
@@ -345,7 +345,7 @@ function run_query_root {
 function create_database {
     app_name="$1"
     app_admin_password="$2"
-    app_admin_username=$3
+    app_admin_username="$3"
     if [ ! -d "$INSTALL_DIR" ]; then
         mkdir "$INSTALL_DIR"
     fi
@@ -366,8 +366,8 @@ quit" > "$INSTALL_DIR/batch.sql"
 }
 
 function run_query_with_output {
-    database_name=$1
-    database_query=$2
+    database_name="$1"
+    database_query="$2"
     keep_database_running
     output=$(mysql -u root --password="$MARIADB_PASSWORD" << EOF
 use $database_name;