ensure environment in try is similar to host (#153) (#207)

Co-authored-by: Michael Greenberg <michael@greenberg.science>

Author: Ioa1

configure.ac

@@ -224,6 +224,7 @@ TRY_TEST_PROG([curl])
 TRY_TEST_PROG([diff])
 TRY_TEST_PROG([touch])
 TRY_TEST_PROG([gunzip])
+TRY_TEST_PROG([realpath])
 
 if test "$missing_test_programs" -ne 0
 then

test/check_env.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+TRY_TOP="${TRY_TOP:-$(git rev-parse --show-toplevel --show-superproject-working-tree 2>/dev/null || echo "${0%/*}")}"
+TRY="$TRY_TOP/try"
+
+cleanup() {
+
+  if [ -f "$expected" ]; then
+    rm "$expected"
+  fi
+
+  if [ -f "$out" ]; then
+    rm "$out"
+  fi
+
+}
+
+out="$(mktemp)"
+expected="$(mktemp)"
+
+echo "$PWD $OLDPWD" >"$expected"
+
+# shellcheck disable=SC2016
+"$TRY" 'echo "$PWD $OLDPWD"' >"$out" || exit 1
+
+if ! diff -q "$expected" "$out"; then
+  exit 2
+fi
+
+rm "$out"
+rm "$expected"
+
+trap 'cleanup' EXIT

test/check_shell.sh

@@ -24,9 +24,9 @@ check_case() {
   expected="$(mktemp)"
   out="$(mktemp)"
   echo "$expected_output" >"$expected"
-  TRY_SHELL="$try_shell" SHELL="$shell" "$TRY" "echo \"\$TRY_SHELL\"" >"$out" || exit 1
+  TRY_SHELL="$try_shell" SHELL="$shell" "$TRY" 'realpath /proc/$$/exe' >"$out" || exit "$case"
 
-  if ! diff -q "$expected" "$out"; then
+  if ! diff "$expected" "$out"; then
     exit "$case"
   fi
 
@@ -37,6 +37,6 @@ check_case() {
 
 trap 'cleanup' EXIT
 
-check_case "/bin/bash" "/bin/sh" "/bin/bash" "1"
+check_case "/bin/bash" "/bin/sh" "$(realpath "/bin/bash")" "1"
 
-check_case "" "/bin/bash" "/bin/bash" "2"
+check_case "" "/bin/bash" "$(realpath "/bin/bash")" "2"

try

@@ -282,15 +282,15 @@ EOF
     cat >"$chroot_executable" <<EOF
 #!/bin/sh
 
-unset START_DIR SANDBOX_DIR UNION_HELPER DIRS_AND_MOUNTS TRY_EXIT_STATUS
+unset START_DIR SANDBOX_DIR UNION_HELPER DIRS_AND_MOUNTS TRY_EXIT_STATUS TRY_COMMAND TRY_SHELL UPDATED_DIRS_AND_MOUNTS
 unset script_to_execute chroot_executable try_mount_log
 
 mount -t proc proc /proc &&
 ln -s /proc/self/fd/0 /dev/stdin &&
 ln -s /proc/self/fd/1 /dev/stdout &&
 ln -s /proc/self/fd/2 /dev/stderr &&
 cd "$START_DIR" &&
-. "$script_to_execute"
+OLDPWD=$OLDPWD . "$script_to_execute"
 EOF
 
     echo "$@" >"$script_to_execute"