Merge pull request #40 from guzman-raphael/fix-home-rename2

Allow workdir to be set properly when entrypoint is not invoked
datajoint · Sep 22, 2021 · de5aba4 · de5aba4
2 parents 67ffab0 + cfa7592
commit de5aba4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/utilities/entrypoint.sh b/utilities/entrypoint.sh
@@ -17,5 +17,4 @@ if ! [ $(id -u) = 0 ]; then
 	fi
 fi
 # Run command
-pwd | grep -qvE "^\/home\/\.?anaconda$" || cd ~
 "$@"
diff --git a/utilities/shell_intercept.sh b/utilities/shell_intercept.sh
@@ -23,6 +23,6 @@ if ! [ $(id -u) = 0 ]; then
 	cd /tmp
 	/startup -user=$ORIG_USER -new_uid=$(id -u) -new_gid=$(id -g) -new_user=${NEW_USER} -new_home=$NEW_HOME
 	export HOME=/home/${NEW_USER}
-	cd $CURR_DIR 2>/dev/null || cd $HOME
+	echo $CURR_DIR | grep -qvE "^\/home\/\.?anaconda$" && cd $CURR_DIR || cd ~
 fi
 export PATH=$(readlink -f "$HOME")/.local/bin:$PATH
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,5 +17,4 @@ if ! [ $(id -u) = 0 ]; then @@
     	fi
     fi
     # Run command
-    pwd | grep -qvE "^\/home\/\.?anaconda$" || cd ~
     "$@"