Fix inconsistency between plain 'env' and 'docktie_cli env' output per …

…#33
docktie · May 7, 2022 · 21e9751 · 21e9751
1 parent 0c70042
commit 21e9751
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/utils/bin/docktie_cli b/utils/bin/docktie_cli
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 ## -------- source common library ---------
-PROJECT_ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../ && pwd )"
-. $PROJECT_ROOTDIR/etc/controller.bash.inc
+SHCF_PLATFORM_ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../ && pwd )"
+. $SHCF_PLATFORM_ROOTDIR/etc/controller.bash.inc
 
 
 ## list of functions to auto-load

diff --git a/utils/lib/kernel/core.bash.inc b/utils/lib/kernel/core.bash.inc
@@ -7,9 +7,7 @@ core() {
 	shift
 
 	## Environment checking dependent on init.sh being run ...
-	if [[ "$DOCKTIE_INIT" = "true" ]] && [[ -e $DOCKTIE_ENV ]]; then
-		. $DOCKTIE_ENV
-
+	if [[ "$DOCKTIE_INIT" = "true" ]]; then
 		DOCKER_COMPOSE_BIN="docker-compose -f $DOCKTIE_DOCKER_COMPOSE_FULLPATH"
 	elif [[ "$script_name" != "docktie_cli" ]] || [[ "$script_subcmd" != "getx" ]]; then
 		echo 'ERROR: DockTie needs to be initialized.'