docker_shell: Rename and change WORKSPACE_EXECROOT

Signed-off-by: Eryk Szpotanski <[email protected]>

docker_shell.sh → docker_shell

@@ -17,20 +17,20 @@ function handle_sigterm() {
 	docker container rm -f "bazel-orfs-$uuid" || true
 }
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+WORKSPACE_EXECROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-if [[ $DIR == */external/bazel-orfs~override ]]; then
-	WORKSPACE_ROOT=$(realpath $DIR/../../../../../../..)
+if [[ $WORKSPACE_EXECROOT == */external/bazel-orfs~override ]]; then
+	WORKSPACE_ROOT=$(realpath -L $WORKSPACE_EXECROOT/../../../..)
 else
-	WORKSPACE_ROOT=$(realpath $DIR/../../../../..)
+	WORKSPACE_ROOT=$(realpath $WORKSPACE_EXECROOT/../..)
 fi
-WORKSPACE_EXECROOT=$WORKSPACE_ROOT/execroot/_main
 WORKSPACE_EXTERNAL=$WORKSPACE_ROOT/external
 
 # Automatically mount bazel-orfs directory if it is used as module with local_path_override
-if [[ $DIR == */external/bazel-orfs~override ]]; then
+if [[ $WORKSPACE_EXECROOT == */external/bazel-orfs~override ]]; then
 	BAZEL_ORFS_DIR=$(realpath $WORKSPACE_ROOT/external/bazel-orfs~override)
 	DOCKER_ARGS="$DOCKER_ARGS -v $BAZEL_ORFS_DIR:$BAZEL_ORFS_DIR"
+	WORKSPACE_EXECROOT=$(realpath -L $WORKSPACE_EXECROOT/../..)
 fi
 
 XSOCK=/tmp/.X11-unix_$uuid