Merge pull request #123 from notfood/patch-1

Update run_bepinex.sh

doorstop/run_bepinex.sh

@@ -5,47 +5,51 @@
 #
 # Usage: Configure the script below and simply run this script when you want to run your game modded.
 
-if [ -z "$1" ]; then echo "Please open run.sh in a text editor and configure executable name. Comment or remove this line when you're done." && exit 1; fi
-
 # -------- SETTINGS --------
 # ---- EDIT AS NEEDED ------
 
 # EDIT THIS: The name of the executable to run
 # LINUX: This is the name of the Unity game executable 
-# MACOS: This is the name of the game app WITHOUT the .app
-executable_name="";
-
+# MACOS: This is the name of the game app folder, include the .app suffix
+executable_name=""
 
 # The rest is automatically handled by BepInEx
 
 # Whether or not to enable Doorstop. Valid values: TRUE or FALSE
-export DOORSTOP_ENABLE=TRUE;
+export DOORSTOP_ENABLE=TRUE
 
 # What .NET assembly to execute. Valid value is a path to a .NET DLL that mono can execute.
-export DOORSTOP_INVOKE_DLL_PATH=${PWD}/BepInEx/core/BepInEx.Preloader.dll;
-
+export DOORSTOP_INVOKE_DLL_PATH="${PWD}/BepInEx/core/BepInEx.Preloader.dll"
 
 # ----- DO NOT EDIT FROM THIS LINE FORWARD  ------
 # ----- (unless you know what you're doing) ------
 
-# Backup current LD_PRELOAD because it can break `file` when running from Steam
-LD_PRELOAD_BAK=$LD_PRELOAD;
-export LD_PRELOAD="";
+if [ ! -x "$1" -a ! -x "$executable_name" ]; then
+    echo "Please open run.sh in a text editor and configure executable name."
+    exit 1
+fi
 
-doorstop_libs=${PWD}/doorstop_libs;
-arch="";
-executable_path="";
-lib_postfix="";
+doorstop_libs="${PWD}/doorstop_libs"
+arch=""
+executable_path=""
+lib_postfix=""
 
-os_type=`uname -s`;
+os_type=`uname -s`
 case $os_type in
-    Linux*)     executable_path=${PWD}/${executable_name};
-                lib_postfix="so";;
-    Darwin*)    executable_path=${PWD}/${executable_name}.app/Contents/MacOS/${executable_name};
-                lib_postfix="dylib";;
-    *)          echo "Cannot identify OS (got $(uname -s))!";
-                echo "Please create an issue at https://github.com/BepInEx/BepInEx/issues."; 
-                exit 1;;
+    Linux*)
+        executable_path="${PWD}/${executable_name}"
+        lib_postfix="so"
+        ;;
+    Darwin*)
+        executable_name=`basename "${executable_name}" .app`
+        executable_path="${PWD}/${executable_name}.app/Contents/MacOS/${executable_name}"
+        lib_postfix="dylib"
+        ;;
+    *)
+        echo "Cannot identify OS (got $(uname -s))!"
+        echo "Please create an issue at https://github.com/BepInEx/BepInEx/issues."
+        exit 1
+        ;;
 esac
 
 # Special case: if there is an arg, use that as executable path
@@ -53,25 +57,36 @@ esac
 # MacOS: arg is path to the .app folder which we need to resolve to the exectuable
 if [ -n "$1" ]; then
     case $os_type in
-        Linux*)     executable_path=$1;;
-        Darwin*)    executable_name=`basename "$1" .app`;
-                    executable_path=$1/Contents/MacOS/$executable_name;;
+        Linux*)
+            executable_path="$1"
+            ;;
+        Darwin*)
+            executable_name=`basename "$1" .app`
+            executable_path="$1/Contents/MacOS/$executable_name"
+            ;;
     esac
 fi
 
-executable_type=`file -b "${executable_path}"`;
+executable_type=`LD_PRELOAD="" file -b "${executable_path}"`;
+
 case $executable_type in
-    *64-bit*)           arch="x64";;
-    *32-bit*|*i386*)    arch="x86";;
-    *)          echo "Cannot identify executable type (got ${executable_type})!"; 
-                echo "Please create an issue at https://github.com/BepInEx/BepInEx/issues."; 
-                exit 1;;
+    *64-bit*)
+        arch="x64"
+        ;;
+    *32-bit*|*i386*)
+        arch="x86"
+        ;;
+    *)
+        echo "Cannot identify executable type (got ${executable_type})!"
+        echo "Please create an issue at https://github.com/BepInEx/BepInEx/issues."
+        exit 1
+        ;;
 esac
 
-doorstop_libname=libdoorstop_${arch}.${lib_postfix};
-export LD_LIBRARY_PATH=${doorstop_libs}:${LD_LIBRARY_PATH};
-export LD_PRELOAD=${doorstop_libs}/$doorstop_libname:$LD_PRELOAD_BAK;
-export DYLD_LIBRARY_PATH=${doorstop_libs};
-export DYLD_INSERT_LIBRARIES=${doorstop_libs}/$doorstop_libname;
+doorstop_libname=libdoorstop_${arch}.${lib_postfix}
+export LD_LIBRARY_PATH="${doorstop_libs}":${LD_LIBRARY_PATH}
+export LD_PRELOAD=$doorstop_libname:$LD_PRELOAD
+export DYLD_LIBRARY_PATH="${doorstop_libs}"
+export DYLD_INSERT_LIBRARIES="${doorstop_libs}/$doorstop_libname"
 
-"${executable_path}"
+"${executable_path}"