summaryrefslogtreecommitdiff
path: root/bin/db_assembler/db_assembler.sh
diff options
context:
space:
mode:
authorYehonal <hw.2@hotmail.it>2016-07-30 10:16:30 +0200
committerYehonal <yehonal.azeroth@gmail.com>2016-08-07 12:23:11 +0200
commit5d5718905a95524be1584fb0232c2698de2910fd (patch)
tree3d4085fd88d78887717dc211b99a38b5aad8abde /bin/db_assembler/db_assembler.sh
parent41d763fd190ad6ae2dd2ca243ea500971778db3a (diff)
fixed db_assembler script
Diffstat (limited to 'bin/db_assembler/db_assembler.sh')
-rwxr-xr-xbin/db_assembler/db_assembler.sh24
1 files changed, 9 insertions, 15 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