From 765fad6133aa07832282d3c389e31afd7f10c210 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Thu, 28 Jul 2016 16:39:19 +0200 Subject: [PATCH] some fixes to bash config files --- .gitignore | 2 -- bin/compiler/.gitignore | 2 ++ bin/compiler/includes/includes.sh | 4 ++++ conf/config.sh.dist | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 bin/compiler/.gitignore diff --git a/.gitignore b/.gitignore index 194e7ad0d..e1e1ab2ee 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,6 @@ # AzerothCore # -*/compiler/config.sh - conf/* !conf/*.dist modules/* diff --git a/bin/compiler/.gitignore b/bin/compiler/.gitignore new file mode 100644 index 000000000..ba57f2bcc --- /dev/null +++ b/bin/compiler/.gitignore @@ -0,0 +1,2 @@ +config.sh + diff --git a/bin/compiler/includes/includes.sh b/bin/compiler/includes/includes.sh index 415084189..1396accb1 100644 --- a/bin/compiler/includes/includes.sh +++ b/bin/compiler/includes/includes.sh @@ -4,6 +4,10 @@ source "$CURRENT_PATH/../../bash_shared/includes.sh" AZTH_PATH_COMPILER="$AZTH_PATH_BIN/compiler" +if [ -f "$AZTH_PATH_COMPILER/config.sh" ]; then + source "$AZTH_PATH_COMPILER/config.sh" # should overwrite previous +fi + function azth_on_after_build() { # move the run engine cp -rvf "$AZTH_PATH_BIN/runners/"* "$INSTALL_PATH/bin/" diff --git a/conf/config.sh.dist b/conf/config.sh.dist index 1952ca984..7a011be03 100644 --- a/conf/config.sh.dist +++ b/conf/config.sh.dist @@ -56,7 +56,7 @@ export GDB_ENABLED=0 export GDB="" # directory where binary are stored -exoirt BINPATH="" +export BINPATH="" ### Put here the pid you configured on your worldserver.conf file ### export SERVERPID=""