ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

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

6
apps/bash_shared/defines.sh
View file

@ -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"

6
apps/bash_shared/includes.sh
View file

@ -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 "$@"; }

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"
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

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"
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

2
apps/db_exporter/db_export.sh
View file

@ -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

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"
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"

4
apps/installer/main.sh
View file

@ -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!"