diff options
| -rw-r--r-- | apps/bash_shared/common.sh | 6 | ||||
| -rw-r--r-- | apps/db_assembler/includes/functions.sh | 26 | ||||
| -rw-r--r-- | conf/dist/config.sh | 24 |
3 files changed, 28 insertions, 28 deletions
diff --git a/apps/bash_shared/common.sh b/apps/bash_shared/common.sh index baeaae86c7..ed0859319c 100644 --- a/apps/bash_shared/common.sh +++ b/apps/bash_shared/common.sh @@ -15,9 +15,9 @@ fi for entry in "$AC_PATH_MODULES/"*/include.sh do - if [ -e $entry ]; then - source $entry + if [ -e "$entry" ]; then + source "$entry" fi done -ACORE_VERSION=$("$AC_PATH_DEPS/jsonpath/JSONPath.sh" -f $AC_PATH_ROOT/acore.json -b '$.version')
\ No newline at end of file +ACORE_VERSION=$("$AC_PATH_DEPS/jsonpath/JSONPath.sh" -f "$AC_PATH_ROOT/acore.json" -b '$.version') diff --git a/apps/db_assembler/includes/functions.sh b/apps/db_assembler/includes/functions.sh index 28c3313536..557785c379 100644 --- a/apps/db_assembler/includes/functions.sh +++ b/apps/db_assembler/includes/functions.sh @@ -145,7 +145,7 @@ function dbasm_assemble() { shopt -s globstar if [ $with_base = true ]; then - echo "" > $OUTPUT_FOLDER$database$suffix_base".sql" + echo "" > "$OUTPUT_FOLDER$database$suffix_base.sql" if [ ! ${#base[@]} -eq 0 ]; then @@ -154,11 +154,11 @@ function dbasm_assemble() { for d in "${base[@]}" do echo "Searching on $d ..." - if [ ! -z $d ]; then + if [ ! -z "$d" ]; then for entry in "$d"/**/*.sql do if [[ -e $entry ]]; then - cat "$entry" >> $OUTPUT_FOLDER$database$suffix_base".sql" + cat "$entry" >> "$OUTPUT_FOLDER$database$suffix_base.sql" fi done fi @@ -167,9 +167,9 @@ function dbasm_assemble() { fi if [ $with_updates = true ]; then - updFile=$OUTPUT_FOLDER$database$suffix_upd".sql" + updFile="$OUTPUT_FOLDER$database$suffix_upd.sql" - echo "" > $updFile + echo "" > "$updFile" if [ ! ${#updates[@]} -eq 0 ]; then echo "Generating $OUTPUT_FOLDER$database$suffix_upd ..." @@ -177,15 +177,15 @@ function dbasm_assemble() { for d in "${updates[@]}" do echo "Searching on $d ..." - if [ ! -z $d ]; then + if [ ! -z "$d" ]; then for entry in "$d"/**/*.sql do if [[ ! -e $entry ]]; then continue fi - echo "-- $file" >> $updFile - cat "$entry" >> $updFile + echo "-- $file" >> "$updFile" + cat "$entry" >> "$updFile" done fi done @@ -193,9 +193,9 @@ function dbasm_assemble() { fi if [ $with_custom = true ]; then - custFile=$OUTPUT_FOLDER$database$suffix_custom".sql" + custFile="$OUTPUT_FOLDER$database$suffix_custom.sql" - echo "" > $custFile + echo "" > "$custFile" if [ ! ${#custom[@]} -eq 0 ]; then echo "Generating $OUTPUT_FOLDER$database$suffix_custom ..." @@ -203,15 +203,15 @@ function dbasm_assemble() { for d in "${custom[@]}" do echo "Searching on $d ..." - if [ ! -z $d ]; then + if [ ! -z "$d" ]; then for entry in "$d"/**/*.sql do if [[ ! -e $entry ]]; then continue fi - echo "-- $file" >> $custFile - cat "$entry" >> $custFile + echo "-- $file" >> "$custFile" + cat "$entry" >> "$custFile" done fi done diff --git a/conf/dist/config.sh b/conf/dist/config.sh index 7bdd13f949..6057018ed0 100644 --- a/conf/dist/config.sh +++ b/conf/dist/config.sh @@ -98,44 +98,44 @@ BACKUP_FOLDER="$AC_PATH_ROOT/env/dist/sql/backup/" # FULL DB DB_AUTH_PATHS=( - $SRCPATH"/data/sql/base/db_auth/" + "$SRCPATH/data/sql/base/db_auth/" ) DB_CHARACTERS_PATHS=( - $SRCPATH"/data/sql/base/db_characters" + "$SRCPATH/data/sql/base/db_characters" ) DB_WORLD_PATHS=( - $SRCPATH"/data/sql/base/db_world/" + "$SRCPATH/data/sql/base/db_world/" ) # UPDATES DB_AUTH_UPDATES_PATHS=( - $SRCPATH"/data/sql/updates/db_auth/" - $SRCPATH"/data/sql/updates/pending_db_auth/" + "$SRCPATH/data/sql/updates/db_auth/" + "$SRCPATH/data/sql/updates/pending_db_auth/" ) DB_CHARACTERS_UPDATES_PATHS=( - $SRCPATH"/data/sql/updates/db_characters/" - $SRCPATH"/data/sql/updates/pending_db_characters/" + "$SRCPATH/data/sql/updates/db_characters/" + "$SRCPATH/data/sql/updates/pending_db_characters/" ) DB_WORLD_UPDATES_PATHS=( - $SRCPATH"/data/sql/updates/db_world/" - $SRCPATH"/data/sql/updates/pending_db_world/" + "$SRCPATH/data/sql/updates/db_world/" + "$SRCPATH/data/sql/updates/pending_db_world/" ) # CUSTOM DB_AUTH_CUSTOM_PATHS=( - $SRCPATH"/data/sql/custom/db_auth/" + "$SRCPATH/data/sql/custom/db_auth/" ) DB_CHARACTERS_CUSTOM_PATHS=( - $SRCPATH"/data/sql/custom/db_characters/" + "$SRCPATH/data/sql/custom/db_characters/" ) DB_WORLD_CUSTOM_PATHS=( - $SRCPATH"/data/sql/custom/db_world/" + "$SRCPATH/data/sql/custom/db_world/" ) ############################################## |