From fcf202b77ee2ebc548ce542e9f02435eb43ec673 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 1 May 2017 21:51:44 +0200 Subject: [PATCH] [AZTH] Reorganized sql files from modules and added to db_assembler --- modules/AzerothTournament/include.sh | 16 +++++----------- modules/BGItemLevel/include.sh | 10 +++++++--- modules/CrossFaction/include.sh | 8 +++++++- .../characters_azth_items_bank.sql} | 0 .../data/sql/{ => world}/creature_template.sql | 0 .../data/sql/{ => world}/npc_text.sql | 0 modules/DonationsVendor/include.sh | 11 +++++++++++ modules/Jukebox/include.sh | 8 ++++++-- modules/PlayerStats/include.sh | 8 +++++++- modules/TimeWalking/include.sh | 10 +++++++--- modules/TournamentSet/include.sh | 14 +++++++++----- modules/arena1v1/include.sh | 2 +- modules/azerothshard/conf/conf.sh.dist | 2 +- modules/azerothshard/include.sh | 2 +- modules/dbc_tools/tocsv.sh | 2 +- modules/dbc_tools/todbc.sh | 2 +- modules/guildhouse/include.sh | 12 +++++++++++- .../chars/table_azth_character_morph.sql | 0 .../extra/00_reputation_vendor_table.sql | 0 .../{ => sql}/extra/01_reputation_vendor.sql | 0 .../extra/hearthstone_criteria_credits.sql | 0 .../data/{ => sql}/extra/hearthstone_quests.sql | 0 .../data/{ => sql}/extra/transmog_items.sql | 0 .../data/{ => sql}/world/00-general.sql | 0 .../data/{ => sql}/world/01_items.sql | 0 .../data/{ => sql}/world/02_pve_quests.sql | 0 .../data/{ => sql}/world/03_update.sql | 0 .../data/{ => sql}/world/04_vendors.sql | 0 .../data/{ => sql}/world/05_quest_tier3.sql | 0 .../data/{ => sql}/world/06_pvp_quests.sql | 0 .../data/{ => sql}/world/07_sacks_of_marks.sql | 0 .../data/{ => sql}/world/08_update.sql | 0 modules/hearthstone-mode/include.sh | 16 +++++++++++++++- modules/mod-transmog/conf/conf.sh.dist | 2 +- modules/mod-transmog/include.sh | 2 +- modules/smartstone/include.sh | 16 +++++++++++++++- modules/xp-rates/include.sh | 8 +++++++- 37 files changed, 114 insertions(+), 37 deletions(-) rename modules/DonationsVendor/data/sql/{haracters_azth_items_bank.sql => characters/characters_azth_items_bank.sql} (100%) rename modules/DonationsVendor/data/sql/{ => world}/creature_template.sql (100%) rename modules/DonationsVendor/data/sql/{ => world}/npc_text.sql (100%) create mode 100644 modules/DonationsVendor/include.sh rename modules/hearthstone-mode/data/{ => sql}/chars/table_azth_character_morph.sql (100%) rename modules/hearthstone-mode/data/{ => sql}/extra/00_reputation_vendor_table.sql (100%) rename modules/hearthstone-mode/data/{ => sql}/extra/01_reputation_vendor.sql (100%) rename modules/hearthstone-mode/data/{ => sql}/extra/hearthstone_criteria_credits.sql (100%) rename modules/hearthstone-mode/data/{ => sql}/extra/hearthstone_quests.sql (100%) rename modules/hearthstone-mode/data/{ => sql}/extra/transmog_items.sql (100%) rename modules/hearthstone-mode/data/{ => sql}/world/00-general.sql (100%) rename modules/hearthstone-mode/data/{ => sql}/world/01_items.sql (100%) rename modules/hearthstone-mode/data/{ => sql}/world/02_pve_quests.sql (100%) rename modules/hearthstone-mode/data/{ => sql}/world/03_update.sql (100%) rename modules/hearthstone-mode/data/{ => sql}/world/04_vendors.sql (100%) rename modules/hearthstone-mode/data/{ => sql}/world/05_quest_tier3.sql (100%) rename modules/hearthstone-mode/data/{ => sql}/world/06_pvp_quests.sql (100%) rename modules/hearthstone-mode/data/{ => sql}/world/07_sacks_of_marks.sql (100%) rename modules/hearthstone-mode/data/{ => sql}/world/08_update.sql (100%) diff --git a/modules/AzerothTournament/include.sh b/modules/AzerothTournament/include.sh index a05c2ecf..1685c0cb 100644 --- a/modules/AzerothTournament/include.sh +++ b/modules/AzerothTournament/include.sh @@ -1,13 +1,7 @@ -#AZTHTOURN_PATH_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" +#!/usr/bin/env bash -#DB_CHARACTERS_CUSTOM_PATHS+=( -# $AZTHTOURN_PATH_ROOT"/data/sql/db-characters/" -#) +TOURNAMENT_MODULE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" -#DB_AUTH_CUSTOM_PATHS+=( -# $AZTHTOURN_PATH_ROOT"/data/sql/db-auth/" -#) - -#DB_WORLD_CUSTOM_PATHS+=( -# $AZTHTOURN_PATH_ROOT"/data/sql/world/" -#) \ No newline at end of file +DB_EXTRA_CUSTOM_PATHS+=( + $TOURNAMENT_MODULE_PATH"/data/sql/extra" +) \ No newline at end of file diff --git a/modules/BGItemLevel/include.sh b/modules/BGItemLevel/include.sh index 71a8b9bd..103f806a 100644 --- a/modules/BGItemLevel/include.sh +++ b/modules/BGItemLevel/include.sh @@ -1,7 +1,11 @@ -#!/bin/bash +#!/usr/bin/env bash -ARENA_MODULE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" +BGITEMLVL_MODULE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" DB_WORLD_CUSTOM_PATHS+=( - $ARENA_MODULE_PATH"/data/sql/*" + $BGITEMLVL_MODULE_PATH"/data/sql/world/" +) + +DB_CHARACTERS_CUSTOM_PATHS+=( + $BGITEMLVL_MODULE_PATH"/data/sql/characters/" ) \ No newline at end of file diff --git a/modules/CrossFaction/include.sh b/modules/CrossFaction/include.sh index a9bf588e..05d4666c 100644 --- a/modules/CrossFaction/include.sh +++ b/modules/CrossFaction/include.sh @@ -1 +1,7 @@ -#!/bin/bash +#!/usr/bin/env bash + +CROSSFACTION_MODULE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" + +DB_EXTRA_CUSTOM_PATHS+=( + $CROSSFACTION_MODULE_PATH"/data/sql/db-extra/" +) \ No newline at end of file diff --git a/modules/DonationsVendor/data/sql/haracters_azth_items_bank.sql b/modules/DonationsVendor/data/sql/characters/characters_azth_items_bank.sql similarity index 100% rename from modules/DonationsVendor/data/sql/haracters_azth_items_bank.sql rename to modules/DonationsVendor/data/sql/characters/characters_azth_items_bank.sql diff --git a/modules/DonationsVendor/data/sql/creature_template.sql b/modules/DonationsVendor/data/sql/world/creature_template.sql similarity index 100% rename from modules/DonationsVendor/data/sql/creature_template.sql rename to modules/DonationsVendor/data/sql/world/creature_template.sql diff --git a/modules/DonationsVendor/data/sql/npc_text.sql b/modules/DonationsVendor/data/sql/world/npc_text.sql similarity index 100% rename from modules/DonationsVendor/data/sql/npc_text.sql rename to modules/DonationsVendor/data/sql/world/npc_text.sql diff --git a/modules/DonationsVendor/include.sh b/modules/DonationsVendor/include.sh new file mode 100644 index 00000000..79cb2483 --- /dev/null +++ b/modules/DonationsVendor/include.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +WOWHEADNPC_MODULE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" + +DB_WORLD_CUSTOM_PATHS+=( + $WOWHEADNPC_MODULE_PATH"/data/sql/world/" +) + +DB_CHARACTERS_CUSTOM_PATHS+=( + $WOWHEADNPC_MODULE_PATH"/data/sql/characters/" +) \ No newline at end of file diff --git a/modules/Jukebox/include.sh b/modules/Jukebox/include.sh index 4c5e3473..b9a6551f 100644 --- a/modules/Jukebox/include.sh +++ b/modules/Jukebox/include.sh @@ -1,7 +1,11 @@ -#!/bin/bash +#!/usr/bin/env bash JUKEBOX_MODULE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" DB_WORLD_CUSTOM_PATHS+=( - $JUKEBOX_MODULE_PATH"/data/sql/*" + $JUKEBOX_MODULE_PATH"/data/sql/world" +) + +DB_EXTRA_CUSTOM_PATHS+=( + $JUKEBOX_MODULE_PATH"/data/sql/extra" ) \ No newline at end of file diff --git a/modules/PlayerStats/include.sh b/modules/PlayerStats/include.sh index a9bf588e..a933d993 100644 --- a/modules/PlayerStats/include.sh +++ b/modules/PlayerStats/include.sh @@ -1 +1,7 @@ -#!/bin/bash +#!/usr/bin/env bash + +PLAYERSTATS_MODULE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" + +DB_CHARACTERS_CUSTOM_PATHS+=( + $PLAYERSTATS_MODULE_PATH"/data/sql/db-chars/" +) diff --git a/modules/TimeWalking/include.sh b/modules/TimeWalking/include.sh index 4c5e3473..38ba6948 100644 --- a/modules/TimeWalking/include.sh +++ b/modules/TimeWalking/include.sh @@ -1,7 +1,11 @@ -#!/bin/bash +#!/usr/bin/env bash -JUKEBOX_MODULE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" +TIMEWALKING_MODULE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" DB_WORLD_CUSTOM_PATHS+=( - $JUKEBOX_MODULE_PATH"/data/sql/*" + $TIMEWALKING_MODULE_PATH"/data/sql/world" +) + +DB_EXTRA_CUSTOM_PATHS+=( + $TIMEWALKING_MODULE_PATH"/data/sql/extra" ) \ No newline at end of file diff --git a/modules/TournamentSet/include.sh b/modules/TournamentSet/include.sh index 4c5e3473..55f8c87e 100644 --- a/modules/TournamentSet/include.sh +++ b/modules/TournamentSet/include.sh @@ -1,7 +1,11 @@ -#!/bin/bash +#!/usr/bin/env bash -JUKEBOX_MODULE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" +TOURNAMENTSET_MODULE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" -DB_WORLD_CUSTOM_PATHS+=( - $JUKEBOX_MODULE_PATH"/data/sql/*" -) \ No newline at end of file +DB_EXTRA_CUSTOM_PATHS+=( + $TOURNAMENTSET_MODULE_PATH"/data/sql/extra/" +) + +DB_CHARACTERS_CUSTOM_PATHS+=( + $TOURNAMENTSET_MODULE_PATH"/data/sql/characters/" +) diff --git a/modules/arena1v1/include.sh b/modules/arena1v1/include.sh index a9bf588e..f1f641af 100644 --- a/modules/arena1v1/include.sh +++ b/modules/arena1v1/include.sh @@ -1 +1 @@ -#!/bin/bash +#!/usr/bin/env bash diff --git a/modules/azerothshard/conf/conf.sh.dist b/modules/azerothshard/conf/conf.sh.dist index b5c028fc..31193cea 100644 --- a/modules/azerothshard/conf/conf.sh.dist +++ b/modules/azerothshard/conf/conf.sh.dist @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash DATABASES+=( "EXTRA" diff --git a/modules/azerothshard/include.sh b/modules/azerothshard/include.sh index 0b0d104f..674fcd0f 100644 --- a/modules/azerothshard/include.sh +++ b/modules/azerothshard/include.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash AZTHSD_PATH_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" diff --git a/modules/dbc_tools/tocsv.sh b/modules/dbc_tools/tocsv.sh index fa0d5856..50cbb166 100644 --- a/modules/dbc_tools/tocsv.sh +++ b/modules/dbc_tools/tocsv.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" diff --git a/modules/dbc_tools/todbc.sh b/modules/dbc_tools/todbc.sh index 762a7c62..e04aceb6 100644 --- a/modules/dbc_tools/todbc.sh +++ b/modules/dbc_tools/todbc.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" diff --git a/modules/guildhouse/include.sh b/modules/guildhouse/include.sh index a9bf588e..3b20db31 100644 --- a/modules/guildhouse/include.sh +++ b/modules/guildhouse/include.sh @@ -1 +1,11 @@ -#!/bin/bash +#!/usr/bin/env bash + +GUILDHOUSE_MODULE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" + +DB_EXTRA_CUSTOM_PATHS+=( + $GUILDHOUSE_MODULE_PATH"/data/sql/db-extra/" +) + +DB_CHARACTERS_CUSTOM_PATHS+=( + $GUILDHOUSE_MODULE_PATH"/data/sql/db-char/" +) \ No newline at end of file diff --git a/modules/hearthstone-mode/data/chars/table_azth_character_morph.sql b/modules/hearthstone-mode/data/sql/chars/table_azth_character_morph.sql similarity index 100% rename from modules/hearthstone-mode/data/chars/table_azth_character_morph.sql rename to modules/hearthstone-mode/data/sql/chars/table_azth_character_morph.sql diff --git a/modules/hearthstone-mode/data/extra/00_reputation_vendor_table.sql b/modules/hearthstone-mode/data/sql/extra/00_reputation_vendor_table.sql similarity index 100% rename from modules/hearthstone-mode/data/extra/00_reputation_vendor_table.sql rename to modules/hearthstone-mode/data/sql/extra/00_reputation_vendor_table.sql diff --git a/modules/hearthstone-mode/data/extra/01_reputation_vendor.sql b/modules/hearthstone-mode/data/sql/extra/01_reputation_vendor.sql similarity index 100% rename from modules/hearthstone-mode/data/extra/01_reputation_vendor.sql rename to modules/hearthstone-mode/data/sql/extra/01_reputation_vendor.sql diff --git a/modules/hearthstone-mode/data/extra/hearthstone_criteria_credits.sql b/modules/hearthstone-mode/data/sql/extra/hearthstone_criteria_credits.sql similarity index 100% rename from modules/hearthstone-mode/data/extra/hearthstone_criteria_credits.sql rename to modules/hearthstone-mode/data/sql/extra/hearthstone_criteria_credits.sql diff --git a/modules/hearthstone-mode/data/extra/hearthstone_quests.sql b/modules/hearthstone-mode/data/sql/extra/hearthstone_quests.sql similarity index 100% rename from modules/hearthstone-mode/data/extra/hearthstone_quests.sql rename to modules/hearthstone-mode/data/sql/extra/hearthstone_quests.sql diff --git a/modules/hearthstone-mode/data/extra/transmog_items.sql b/modules/hearthstone-mode/data/sql/extra/transmog_items.sql similarity index 100% rename from modules/hearthstone-mode/data/extra/transmog_items.sql rename to modules/hearthstone-mode/data/sql/extra/transmog_items.sql diff --git a/modules/hearthstone-mode/data/world/00-general.sql b/modules/hearthstone-mode/data/sql/world/00-general.sql similarity index 100% rename from modules/hearthstone-mode/data/world/00-general.sql rename to modules/hearthstone-mode/data/sql/world/00-general.sql diff --git a/modules/hearthstone-mode/data/world/01_items.sql b/modules/hearthstone-mode/data/sql/world/01_items.sql similarity index 100% rename from modules/hearthstone-mode/data/world/01_items.sql rename to modules/hearthstone-mode/data/sql/world/01_items.sql diff --git a/modules/hearthstone-mode/data/world/02_pve_quests.sql b/modules/hearthstone-mode/data/sql/world/02_pve_quests.sql similarity index 100% rename from modules/hearthstone-mode/data/world/02_pve_quests.sql rename to modules/hearthstone-mode/data/sql/world/02_pve_quests.sql diff --git a/modules/hearthstone-mode/data/world/03_update.sql b/modules/hearthstone-mode/data/sql/world/03_update.sql similarity index 100% rename from modules/hearthstone-mode/data/world/03_update.sql rename to modules/hearthstone-mode/data/sql/world/03_update.sql diff --git a/modules/hearthstone-mode/data/world/04_vendors.sql b/modules/hearthstone-mode/data/sql/world/04_vendors.sql similarity index 100% rename from modules/hearthstone-mode/data/world/04_vendors.sql rename to modules/hearthstone-mode/data/sql/world/04_vendors.sql diff --git a/modules/hearthstone-mode/data/world/05_quest_tier3.sql b/modules/hearthstone-mode/data/sql/world/05_quest_tier3.sql similarity index 100% rename from modules/hearthstone-mode/data/world/05_quest_tier3.sql rename to modules/hearthstone-mode/data/sql/world/05_quest_tier3.sql diff --git a/modules/hearthstone-mode/data/world/06_pvp_quests.sql b/modules/hearthstone-mode/data/sql/world/06_pvp_quests.sql similarity index 100% rename from modules/hearthstone-mode/data/world/06_pvp_quests.sql rename to modules/hearthstone-mode/data/sql/world/06_pvp_quests.sql diff --git a/modules/hearthstone-mode/data/world/07_sacks_of_marks.sql b/modules/hearthstone-mode/data/sql/world/07_sacks_of_marks.sql similarity index 100% rename from modules/hearthstone-mode/data/world/07_sacks_of_marks.sql rename to modules/hearthstone-mode/data/sql/world/07_sacks_of_marks.sql diff --git a/modules/hearthstone-mode/data/world/08_update.sql b/modules/hearthstone-mode/data/sql/world/08_update.sql similarity index 100% rename from modules/hearthstone-mode/data/world/08_update.sql rename to modules/hearthstone-mode/data/sql/world/08_update.sql diff --git a/modules/hearthstone-mode/include.sh b/modules/hearthstone-mode/include.sh index a9bf588e..b7766fc9 100644 --- a/modules/hearthstone-mode/include.sh +++ b/modules/hearthstone-mode/include.sh @@ -1 +1,15 @@ -#!/bin/bash +#!/usr/bin/env bash + +HEARTHSTONEMODE_MODULE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" + +DB_EXTRA_CUSTOM_PATHS+=( + $HEARTHSTONEMODE_MODULE_PATH"/data/sql/extra/" +) + +DB_CHARACTERS_CUSTOM_PATHS+=( + $HEARTHSTONEMODE_MODULE_PATH"/data/sql/chars/" +) + +DB_WORLD_CUSTOM_PATHS+=( + $HEARTHSTONEMODE_MODULE_PATH"/data/sql/world/" +) \ No newline at end of file diff --git a/modules/mod-transmog/conf/conf.sh.dist b/modules/mod-transmog/conf/conf.sh.dist index 1ea5b7a1..c19aa175 100644 --- a/modules/mod-transmog/conf/conf.sh.dist +++ b/modules/mod-transmog/conf/conf.sh.dist @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # CUSTOM diff --git a/modules/mod-transmog/include.sh b/modules/mod-transmog/include.sh index 1b3cc628..159bc447 100644 --- a/modules/mod-transmog/include.sh +++ b/modules/mod-transmog/include.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash TRANSM_PATH_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" diff --git a/modules/smartstone/include.sh b/modules/smartstone/include.sh index a9bf588e..f209900c 100644 --- a/modules/smartstone/include.sh +++ b/modules/smartstone/include.sh @@ -1 +1,15 @@ -#!/bin/bash +#!/usr/bin/env bash + +SMARTSTONE_MODULE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" + +DB_EXTRA_CUSTOM_PATHS+=( + $SMARTSTONE_MODULE_PATH"/data/sql/extra/" +) + +DB_CHARACTERS_CUSTOM_PATHS+=( + $SMARTSTONE_MODULE_PATH"/data/sql/chars/" +) + +DB_WORLD_CUSTOM_PATHS+=( + $SMARTSTONE_MODULE_PATH"/data/sql/world/" +) \ No newline at end of file diff --git a/modules/xp-rates/include.sh b/modules/xp-rates/include.sh index a9bf588e..98e144a3 100644 --- a/modules/xp-rates/include.sh +++ b/modules/xp-rates/include.sh @@ -1 +1,7 @@ -#!/bin/bash +#!/usr/bin/env bash + +XPRATES_MODULE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" + +DB_CHARACTERS_CUSTOM_PATHS+=( + $XPRATES_MODULE_PATH"/data/sql/db-chars/" +) \ No newline at end of file