3 files changed, 13 insertions, 5 deletions
diff --git a/apps/bash_shared/common.sh b/apps/bash_shared/common.sh
index 027a49bed3..acd23eacdf 100644
--- a/apps/bash_shared/common.sh
+++ b/apps/bash_shared/common.sh
@@ -1,6 +1,7 @@
 function registerHooks() { acore_event_registerHooks "$@"; }
 function runHooks() { acore_event_runHooks "$@"; }
 
+#shellcheck source=../../conf/dist/config.sh
 source "$AC_PATH_CONF/dist/config.sh" # include dist to avoid missing conf variables
 
 # first check if it's defined in env, otherwise use the default
diff --git a/apps/bash_shared/defines.sh b/apps/bash_shared/defines.sh
index 4f5372215c..4b014bd9c1 100644
--- a/apps/bash_shared/defines.sh
+++ b/apps/bash_shared/defines.sh
@@ -19,10 +19,10 @@ case $AC_PATH_ROOT in
   *) AC_PATH_ROOT=$PWD/$AC_PATH_ROOT;;
 esac
 
-AC_PATH_CONF="$AC_PATH_ROOT/conf"
+export AC_PATH_CONF="$AC_PATH_ROOT/conf"
 
-AC_PATH_MODULES="$AC_PATH_ROOT/modules"
+export AC_PATH_MODULES="$AC_PATH_ROOT/modules"
 
-AC_PATH_DEPS="$AC_PATH_ROOT/deps"
+export AC_PATH_DEPS="$AC_PATH_ROOT/deps"
 
-AC_PATH_VAR="$AC_PATH_ROOT/var"
+export AC_PATH_VAR="$AC_PATH_ROOT/var"
diff --git a/apps/bash_shared/includes.sh b/apps/bash_shared/includes.sh
index 63593e4c56..d2bf07db12 100644
--- a/apps/bash_shared/includes.sh
+++ b/apps/bash_shared/includes.sh
@@ -7,10 +7,17 @@ AC_PATH_APPS="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
 
 AC_PATH_SHARED="$AC_PATH_APPS/bash_shared"
 
+# shellcheck source=./defines.sh
 source "$AC_PATH_SHARED/defines.sh"
 
+# shellcheck source=../../deps/acore/bash-lib/src/event/hooks.sh
 source "$AC_PATH_DEPS/acore/bash-lib/src/event/hooks.sh"
 
+# shellcheck source=./common.sh
 source "$AC_PATH_SHARED/common.sh"
 
-[[ "$OSTYPE" = "msys" ]] && AC_BINPATH_FULL="$BINPATH" || AC_BINPATH_FULL="$BINPATH/bin"
+if [[ "$OSTYPE" = "msys" ]]; then
+    AC_BINPATH_FULL="$BINPATH"
+else
+    export AC_BINPATH_FULL="$BINPATH/bin"
+fi