diff options
| -rwxr-xr-x | bin/db_assembler/db_assembler.sh | 24 | ||||
| -rw-r--r-- | conf/config.sh.dist | 6 |
2 files changed, 12 insertions, 18 deletions
diff --git a/bin/db_assembler/db_assembler.sh b/bin/db_assembler/db_assembler.sh index 620b5353a6..ebc59a6295 100755 --- a/bin/db_assembler/db_assembler.sh +++ b/bin/db_assembler/db_assembler.sh @@ -2,6 +2,8 @@ SRCPATH=$(readlink -f "../../") +source $SRCPATH"/bin/bash_shared/includes.sh" + # # You can pass latest version as first argument of this script # @@ -27,7 +29,7 @@ function assemble() { start_sql=$2 var_base="DB_"$database"_PATHS" - base=${!var_full} + base=${!var_base} var_updates="DB_"$database"_UPDATE_PATHS" updates=${!var_updates} @@ -52,22 +54,14 @@ function assemble() { for d in "${base[@]}" do - for entry in "$d"/*.sql "$d"/**/*.sql - do - if [ ! -z $d ]; then - file=$(basename $entry) - if [[ "$file" > "$start_sql" ]] - then + if [ ! -z $d ]; then + for entry in "$d"/*.sql "$d"/**/*.sql + do if [ -e $entry ]; then - if [[ "$gtversion" < "$file" ]]; then - gtversion=$file - fi - - cat "$entry" >> $OUTPUT_FOLDER$database$suffix_base".sql" + cat "$entry" >> $OUTPUT_FOLDER$database$suffix_base".sql" fi - fi - fi - done + done + fi done fi diff --git a/conf/config.sh.dist b/conf/config.sh.dist index fd59250a4e..88b99d2fde 100644 --- a/conf/config.sh.dist +++ b/conf/config.sh.dist @@ -95,15 +95,15 @@ OUTPUT_FOLDER="output/" # FULL DB DB_CHARACTERS_PATHS=( - $SRCPATH"/data/sql/databases/" + $SRCPATH"/data/sql/base/characters" ) DB_AUTH_PATHS=( - $SRCPATH"/data/sql/databases/" + $SRCPATH"/data/sql/base/auth/" ) DB_WORLD_PATHS=( - $SRCPATH"/data/sql/databases/" + $SRCPATH"/data/sql/base/world/" ) # UPDATES |