yolinlin/azerothcore-wotlk-pbot
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2025-11-29 17:38:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bash: fixing scripts after directory rework

Browse Source
This commit is contained in:
Yehonal
2017-10-13 14:37:37 +02:00
parent f06f32849f
commit bbc9a21e94
16 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitignore vendored
View File

@@ -4,15 +4,13 @@
conf/* conf/*
!conf/*.dist !conf/*.dist
env/dist/*
env/user/*
modules/* modules/*
!modules/drassil
modules/drassil/joiner
!modules/hw-core
!modules/acore
!modules/worldengine
build*/ build*/
var/build/*
!.gitkeep
# #
#Generic #Generic

6
apps/bash_shared/defines.sh
View File

@@ -1,11 +1,13 @@
unamestr=`uname` unamestr=`uname`
if [[ "$unamestr" == 'Darwin' ]]; then if [[ "$unamestr" == 'Darwin' ]]; then
AC_PATH_ROOT=$(greadlink -f "$AC_PATH_BIN/../") AC_PATH_ROOT=$(greadlink -f "$AC_PATH_APPS/../")
else else
AC_PATH_ROOT=$(readlink -f "$AC_PATH_BIN/../") AC_PATH_ROOT=$(readlink -f "$AC_PATH_APPS/../")
fi fi
AC_PATH_CONF="$AC_PATH_ROOT/conf" AC_PATH_CONF="$AC_PATH_ROOT/conf"
AC_PATH_MODULES="$AC_PATH_ROOT/modules" AC_PATH_MODULES="$AC_PATH_ROOT/modules"
AC_PATH_DEPS="$AC_PATH_ROOT/deps"

6
apps/bash_shared/includes.sh
View File

@@ -3,13 +3,13 @@
# force default language for applications # force default language for applications
LC_ALL=C LC_ALL=C
AC_PATH_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )" AC_PATH_APPS="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
AC_PATH_SHARED="$AC_PATH_BIN/bash_shared" AC_PATH_SHARED="$AC_PATH_APPS/bash_shared"
source "$AC_PATH_SHARED/defines.sh" source "$AC_PATH_SHARED/defines.sh"
source "$AC_PATH_MODULES/hw-core/bash-lib-event/src/hooks.sh" source "$AC_PATH_DEPS/hw-core/bash-lib-event/src/hooks.sh"
function registerHooks() { hwc_event_register_hooks "$@"; } function registerHooks() { hwc_event_register_hooks "$@"; }

2
apps/compiler/includes/includes.sh
View File

@@ -2,7 +2,7 @@ CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source "$CURRENT_PATH/../../bash_shared/includes.sh" source "$CURRENT_PATH/../../bash_shared/includes.sh"
AC_PATH_COMPILER="$AC_PATH_BIN/compiler" AC_PATH_COMPILER="$AC_PATH_APPS/compiler"
if [ -f "$AC_PATH_COMPILER/config.sh" ]; then if [ -f "$AC_PATH_COMPILER/config.sh" ]; then
source "$AC_PATH_COMPILER/config.sh" # should overwrite previous source "$AC_PATH_COMPILER/config.sh" # should overwrite previous

2
apps/db_assembler/includes/includes.sh
View File

@@ -2,7 +2,7 @@ CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source "$CURRENT_PATH/../../bash_shared/includes.sh" source "$CURRENT_PATH/../../bash_shared/includes.sh"
AC_PATH_DBASSEMBLER="$AC_PATH_BIN/db_assembler" AC_PATH_DBASSEMBLER="$AC_PATH_APPS/db_assembler"
if [ -f "$AC_PATH_DBASSEMBLER/config.sh" ]; then if [ -f "$AC_PATH_DBASSEMBLER/config.sh" ]; then
source "$AC_PATH_DBASSEMBLER/config.sh" # should overwrite previous source "$AC_PATH_DBASSEMBLER/config.sh" # should overwrite previous

2
apps/db_exporter/db_export.sh
View File

@@ -2,7 +2,7 @@
ROOTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../../" && pwd )" ROOTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../../" && pwd )"
source $ROOTPATH"/bin/bash_shared/includes.sh" source $ROOTPATH"/apps/bash_shared/includes.sh"
if [ -f "./config.sh" ]; then if [ -f "./config.sh" ]; then
source "./config.sh" # should overwrite previous source "./config.sh" # should overwrite previous

6
apps/installer/includes/includes.sh
View File

@@ -2,13 +2,13 @@ CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source "$CURRENT_PATH/../../bash_shared/includes.sh" source "$CURRENT_PATH/../../bash_shared/includes.sh"
AC_PATH_INSTALLER="$AC_PATH_BIN/installer" AC_PATH_INSTALLER="$AC_PATH_APPS/installer"
if [ -f "$AC_PATH_INSTALLER/config.sh" ]; then if [ -f "$AC_PATH_INSTALLER/config.sh" ]; then
source "$AC_PATH_INSTALLER/config.sh" # should overwrite previous source "$AC_PATH_INSTALLER/config.sh" # should overwrite previous
fi fi
source "$AC_PATH_BIN/compiler/includes/includes.sh" source "$AC_PATH_APPS/compiler/includes/includes.sh"
source "$AC_PATH_BIN/db_assembler/includes/includes.sh" source "$AC_PATH_APPS/db_assembler/includes/includes.sh"
source "$AC_PATH_INSTALLER/includes/functions.sh" source "$AC_PATH_INSTALLER/includes/functions.sh"

4
apps/installer/main.sh
View File

@@ -53,10 +53,10 @@ function _switch() {
inst_module_remove $2 inst_module_remove $2
;; ;;
"Sub Menu >> Compiler") "Sub Menu >> Compiler")
bash "$AC_PATH_BIN/compiler/compiler.sh" bash "$AC_PATH_APPS/compiler/compiler.sh"
;; ;;
"Sub Menu >> DB Assembler") "Sub Menu >> DB Assembler")
bash "$AC_PATH_BIN/db_assembler/db_assembler.sh" bash "$AC_PATH_APPS/db_assembler/db_assembler.sh"
;; ;;
"Quit") "Quit")
echo "Goodbye!" echo "Goodbye!"

3
bin/acore Normal file
View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
source ./acore-installer

3
bin/acore-compiler Normal file
View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
bash ../apps/compiler/compiler.sh

3
bin/acore-db-asm Normal file
View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
bash ../apps/db_assembler/db_assembler.sh

3
bin/acore-db-export Normal file
View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
bash ../apps/db_exporter/db_exporter.sh

3
bin/acore-db-pendings Normal file
View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
bash ../apps/db_pendings/import.sh

3
bin/acore-installer Normal file
View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
bash ../apps/installer/main.sh

10
conf/config.sh.dist
View File

@@ -2,13 +2,13 @@
SRCPATH="$AC_PATH_ROOT" SRCPATH="$AC_PATH_ROOT"
# absolute path where build files must be stored # absolute path where build files must be stored
BUILDPATH="$AC_PATH_ROOT/build/obj" BUILDPATH="$AC_PATH_ROOT/var/build/obj"
# absolute path where binary files must be stored # absolute path where binary files must be stored
BINPATH="$AC_PATH_ROOT/build/dist" BINPATH="$AC_PATH_ROOT/env/dist"
# absolute path where config. files must be stored # absolute path where config. files must be stored
CONFDIR="$AC_PATH_ROOT/build/dist/etc/" CONFDIR="$AC_PATH_ROOT/env/dist/etc/"
############################################## ##############################################
# #
@@ -71,7 +71,7 @@ DATABASES=(
"WORLD" "WORLD"
) )
OUTPUT_FOLDER="$AC_PATH_ROOT/bin/db_assembler/output/" OUTPUT_FOLDER="$AC_PATH_ROOT/env/dist/sql/"
# #
# Enable following flag # Enable following flag
@@ -80,7 +80,7 @@ OUTPUT_FOLDER="$AC_PATH_ROOT/bin/db_assembler/output/"
# #
BACKUP_ENABLE=true BACKUP_ENABLE=true
BACKUP_FOLDER="$AC_PATH_ROOT/bin/db_assembler/backup/" BACKUP_FOLDER="$AC_PATH_ROOT/env/dist/sql/backup/"
# FULL DB # FULL DB
DB_CHARACTERS_PATHS=( DB_CHARACTERS_PATHS=(

2
install.sh
View File

@@ -12,4 +12,4 @@ if [[ $1 == "dev" ]]; then
fi fi
source "$CUR_PATH/bin/installer/main.sh" source "$CUR_PATH/apps/installer/main.sh"