run.sh: Resolve target_assembly to an absolute path

Author: arrowmaster

assets/nix/run.sh

@@ -8,9 +8,6 @@
 # 1. Via CLI: Run ./run.sh <path to game> [doorstop arguments] [game arguments]
 # 2. Via config: edit the options below and run ./run.sh without any arguments
 
-# Use POSIX-compatible way to get the directory of the executable
-a="/$0"; a=${a%/*}; a=${a#/}; a=${a:-.}; BASEDIR=$(cd "$a" || exit; pwd -P)
-
 # LINUX: name of Unity executable
 # MACOS: name of the .app directory
 executable_name=""
@@ -107,6 +104,9 @@ if [ -x "$1" ] ; then
     shift
 fi
 
+# Use POSIX-compatible way to get the directory of the executable
+a="/$0"; a=${a%/*}; a=${a#/}; a=${a:-.}; BASEDIR=$(cd "$a" || exit; pwd -P)
+
 arch=""
 executable_path=""
 lib_extension=""
@@ -169,8 +169,7 @@ _readlink() {
     echo "$link"
 }
 
-
-resolve_executable_path () {
+resolve_abs_path () {
     e_path="$(abs_path "$1")"
 
     while [ -L "${e_path}" ]; do 
@@ -180,7 +179,7 @@ resolve_executable_path () {
 }
 
 # Get absolute path of executable
-executable_path=$(resolve_executable_path "${executable_path}")
+executable_path=$(resolve_abs_path "${executable_path}")
 
 # Figure out the arch of the executable with file
 file_out="$(LD_PRELOAD="" file -b "${executable_path}")"
@@ -284,9 +283,15 @@ while [ $i -lt $max ]; do
     i=$((i+1))
 done
 
+# Get absolute path of target assembly
+if [ "$target_assembly" = "${target_assembly#/}" ]; then
+    target_assembly_path="${BASEDIR}/${target_assembly}"
+fi
+target_assembly_path=$(resolve_abs_path "${target_assembly_path}")
+
 # Move variables to environment
 export DOORSTOP_ENABLED="$enabled"
-export DOORSTOP_TARGET_ASSEMBLY="$target_assembly"
+export DOORSTOP_TARGET_ASSEMBLY="$target_assembly_path"
 export DOORSTOP_BOOT_CONFIG_OVERRIDE="$boot_config_override"
 export DOORSTOP_IGNORE_DISABLED_ENV="$ignore_disable_switch"
 export DOORSTOP_MONO_DLL_SEARCH_PATH_OVERRIDE="$dll_search_path_override"