From bbc9a21e94f53cc1e9916db4b8ac6a0ee600da3a Mon Sep 17 00:00:00 2001 From: Yehonal Date: Fri, 13 Oct 2017 14:37:37 +0200 Subject: [PATCH] Bash: fixing scripts after directory rework --- .gitignore | 12 +++++------- apps/bash_shared/defines.sh | 6 ++++-- apps/bash_shared/includes.sh | 6 +++--- apps/compiler/includes/includes.sh | 2 +- apps/db_assembler/includes/includes.sh | 2 +- apps/db_exporter/db_export.sh | 2 +- apps/installer/includes/includes.sh | 6 +++--- apps/installer/main.sh | 4 ++-- bin/acore | 3 +++ bin/acore-compiler | 3 +++ bin/acore-db-asm | 3 +++ bin/acore-db-export | 3 +++ bin/acore-db-pendings | 3 +++ bin/acore-installer | 3 +++ conf/config.sh.dist | 10 +++++----- install.sh | 2 +- 16 files changed, 44 insertions(+), 26 deletions(-) create mode 100644 bin/acore create mode 100644 bin/acore-compiler create mode 100644 bin/acore-db-asm create mode 100644 bin/acore-db-export create mode 100644 bin/acore-db-pendings create mode 100644 bin/acore-installer diff --git a/.gitignore b/.gitignore index 57b2b70b0..afbffbff6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,15 +4,13 @@ conf/* !conf/*.dist +env/dist/* +env/user/* modules/* - -!modules/drassil -modules/drassil/joiner -!modules/hw-core -!modules/acore -!modules/worldengine - build*/ +var/build/* + +!.gitkeep # #Generic diff --git a/apps/bash_shared/defines.sh b/apps/bash_shared/defines.sh index 512173a8b..8a3eb6e18 100644 --- a/apps/bash_shared/defines.sh +++ b/apps/bash_shared/defines.sh @@ -1,11 +1,13 @@ unamestr=`uname` if [[ "$unamestr" == 'Darwin' ]]; then - AC_PATH_ROOT=$(greadlink -f "$AC_PATH_BIN/../") + AC_PATH_ROOT=$(greadlink -f "$AC_PATH_APPS/../") else - AC_PATH_ROOT=$(readlink -f "$AC_PATH_BIN/../") + AC_PATH_ROOT=$(readlink -f "$AC_PATH_APPS/../") fi AC_PATH_CONF="$AC_PATH_ROOT/conf" AC_PATH_MODULES="$AC_PATH_ROOT/modules" +AC_PATH_DEPS="$AC_PATH_ROOT/deps" + diff --git a/apps/bash_shared/includes.sh b/apps/bash_shared/includes.sh index 8dd3c9821..d90b4b451 100644 --- a/apps/bash_shared/includes.sh +++ b/apps/bash_shared/includes.sh @@ -3,13 +3,13 @@ # force default language for applications 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_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 "$@"; } diff --git a/apps/compiler/includes/includes.sh b/apps/compiler/includes/includes.sh index ffde93a73..358a43cf9 100644 --- a/apps/compiler/includes/includes.sh +++ b/apps/compiler/includes/includes.sh @@ -2,7 +2,7 @@ CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" 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 source "$AC_PATH_COMPILER/config.sh" # should overwrite previous diff --git a/apps/db_assembler/includes/includes.sh b/apps/db_assembler/includes/includes.sh index b4ac55515..50bb57535 100644 --- a/apps/db_assembler/includes/includes.sh +++ b/apps/db_assembler/includes/includes.sh @@ -2,7 +2,7 @@ CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" 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 source "$AC_PATH_DBASSEMBLER/config.sh" # should overwrite previous diff --git a/apps/db_exporter/db_export.sh b/apps/db_exporter/db_export.sh index dc321f90a..c7dff778d 100644 --- a/apps/db_exporter/db_export.sh +++ b/apps/db_exporter/db_export.sh @@ -2,7 +2,7 @@ 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 source "./config.sh" # should overwrite previous diff --git a/apps/installer/includes/includes.sh b/apps/installer/includes/includes.sh index fdede154f..16ba79579 100644 --- a/apps/installer/includes/includes.sh +++ b/apps/installer/includes/includes.sh @@ -2,13 +2,13 @@ CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" 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 source "$AC_PATH_INSTALLER/config.sh" # should overwrite previous fi -source "$AC_PATH_BIN/compiler/includes/includes.sh" -source "$AC_PATH_BIN/db_assembler/includes/includes.sh" +source "$AC_PATH_APPS/compiler/includes/includes.sh" +source "$AC_PATH_APPS/db_assembler/includes/includes.sh" source "$AC_PATH_INSTALLER/includes/functions.sh" diff --git a/apps/installer/main.sh b/apps/installer/main.sh index a71bca199..7123117a4 100644 --- a/apps/installer/main.sh +++ b/apps/installer/main.sh @@ -53,10 +53,10 @@ function _switch() { inst_module_remove $2 ;; "Sub Menu >> Compiler") - bash "$AC_PATH_BIN/compiler/compiler.sh" + bash "$AC_PATH_APPS/compiler/compiler.sh" ;; "Sub Menu >> DB Assembler") - bash "$AC_PATH_BIN/db_assembler/db_assembler.sh" + bash "$AC_PATH_APPS/db_assembler/db_assembler.sh" ;; "Quit") echo "Goodbye!" diff --git a/bin/acore b/bin/acore new file mode 100644 index 000000000..a9c10efb2 --- /dev/null +++ b/bin/acore @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source ./acore-installer \ No newline at end of file diff --git a/bin/acore-compiler b/bin/acore-compiler new file mode 100644 index 000000000..aa356deed --- /dev/null +++ b/bin/acore-compiler @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +bash ../apps/compiler/compiler.sh \ No newline at end of file diff --git a/bin/acore-db-asm b/bin/acore-db-asm new file mode 100644 index 000000000..7cc11c8ef --- /dev/null +++ b/bin/acore-db-asm @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +bash ../apps/db_assembler/db_assembler.sh \ No newline at end of file diff --git a/bin/acore-db-export b/bin/acore-db-export new file mode 100644 index 000000000..9a1f15458 --- /dev/null +++ b/bin/acore-db-export @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +bash ../apps/db_exporter/db_exporter.sh \ No newline at end of file diff --git a/bin/acore-db-pendings b/bin/acore-db-pendings new file mode 100644 index 000000000..569d161c6 --- /dev/null +++ b/bin/acore-db-pendings @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +bash ../apps/db_pendings/import.sh \ No newline at end of file diff --git a/bin/acore-installer b/bin/acore-installer new file mode 100644 index 000000000..c61d00458 --- /dev/null +++ b/bin/acore-installer @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +bash ../apps/installer/main.sh \ No newline at end of file diff --git a/conf/config.sh.dist b/conf/config.sh.dist index 5aeff93df..96bde9836 100644 --- a/conf/config.sh.dist +++ b/conf/config.sh.dist @@ -2,13 +2,13 @@ SRCPATH="$AC_PATH_ROOT" # 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 -BINPATH="$AC_PATH_ROOT/build/dist" +BINPATH="$AC_PATH_ROOT/env/dist" # 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" ) -OUTPUT_FOLDER="$AC_PATH_ROOT/bin/db_assembler/output/" +OUTPUT_FOLDER="$AC_PATH_ROOT/env/dist/sql/" # # Enable following flag @@ -80,7 +80,7 @@ OUTPUT_FOLDER="$AC_PATH_ROOT/bin/db_assembler/output/" # BACKUP_ENABLE=true -BACKUP_FOLDER="$AC_PATH_ROOT/bin/db_assembler/backup/" +BACKUP_FOLDER="$AC_PATH_ROOT/env/dist/sql/backup/" # FULL DB DB_CHARACTERS_PATHS=( diff --git a/install.sh b/install.sh index 8be9c9970..8c6c42fe0 100755 --- a/install.sh +++ b/install.sh @@ -12,4 +12,4 @@ if [[ $1 == "dev" ]]; then fi -source "$CUR_PATH/bin/installer/main.sh" +source "$CUR_PATH/apps/installer/main.sh"