From 109c6f3e86db7fe324dc665e69788b07890bb46f Mon Sep 17 00:00:00 2001
From: Eskild Hustvedt <user@zerodogg.org>
Date: Sun, 14 Apr 2024 19:56:18 +0200
Subject: [PATCH] Fix handling of nxm:// URLs for MO2 (#1082)

* Fix handling of nxm:// URLs

It now writes the MO2*Conf files on each startup of MO2, and in addition to the
STEAM*/PROTON variables it will now also write MO2PFX, MO2WINE and MO2INST, so
that it can launch URLs in an MO2 instance launched by startMO2

* Updated PROGVERS

* Fixed check for MO2INST
---
 steamtinkerlaunch | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/steamtinkerlaunch b/steamtinkerlaunch
index c0b44e9c..6547cba2 100755
--- a/steamtinkerlaunch
+++ b/steamtinkerlaunch
@@ -7,7 +7,7 @@
 PREFIX="/usr"
 PROGNAME="SteamTinkerLaunch"
 NICEPROGNAME="Steam Tinker Launch"
-PROGVERS="v14.0.20240327-1"
+PROGVERS="v14.0.20240415-1"
 PROGCMD="${0##*/}"
 PROGINTERNALPROTNAME="Proton-stl"
 SHOSTL="stl"
@@ -17564,6 +17564,12 @@ function startMO2 {
 		mkProjDir "$PFXSUTEMP"
 		cd "${MO2EXE%/*}" >/dev/null || return
 
+		if [ -n "$MOINST" ] && [ "$MOINST" == "portable" ]; then
+			updateMO2PortConf
+		else
+			updateMO2GlobConf
+		fi
+
 		if [ -n "$MO2INST" ]; then
 			writelog "INFO" "${FUNCNAME[0]} - WINEDEBUG=\"-all\" WINEPREFIX=\"$MO2PFX\" \"$MO2WINE\" \"$MO2EXE\" -i \"$MO2INST\"" E
 			WINEDEBUG="-all" WINEPREFIX="$MO2PFX" "$MO2WINE" "$MO2EXE" -i "$MO2INST" 2>&1 | tee "$STLSHM/${FUNCNAME[0]}_${IFILE##*/}.log"
@@ -17620,6 +17626,16 @@ function dlMod2nexurl {
 			writelog "INFO" "${FUNCNAME[0]} - Starting portable '$RUNPROTON run ${MO}.exe $1'"
 			STEAM_COMPAT_CLIENT_INSTALL_PATH="$STEAM_COMPAT_CLIENT_INSTALL_PATH" STEAM_COMPAT_DATA_PATH="$STEAM_COMPAT_DATA_PATH" "$RUNPROTON" run "${MO}.exe" "$1" 2>&1 | tee /tmp/RUNMO2DL.log
 			cd - >/dev/null || return
+		elif [ -d "${GMO2EXE%/*}" ] && [ -n "$MO2PFX" ] && [ -n "$MO2WINE" ]; then
+			writelog "INFO" "${FUNCNAME[0]} - Download Url '$1' for game '$MONGURL' using data from portable '$MYPORTDLDAT'"
+			cd "${GMO2EXE%/*}" >/dev/null || return
+			writelog "INFO" "${FUNCNAME[0]} - Starting portable MO2 in prefix '$MO2PFX' using '$MO2WINE'"
+			if [ -n "$MO2INST" ]; then
+				WINEDEBUG="-all" WINEPREFIX="$MO2PFX" "$MO2WINE" "$GMO2EXE" -i "$MO2INST" "$1" 2>&1 | tee /tmp/RUNMO2DL.log
+			else
+				WINEDEBUG="-all" WINEPREFIX="$MO2PFX" "$MO2WINE" "$GMO2EXE" "$1" 2>&1 | tee /tmp/RUNMO2DL.log
+			fi
+			cd - >/dev/null || return
 		else
 			writelog "ERROR" "${FUNCNAME[0]} - Attempted to download Url '$1' for game '$MONGURL', but seems like portable '$MYPORTDLDAT' has incomplete data - trying global $MO" "E"
 			dlMod2globnexurl "$1"
@@ -19744,8 +19760,11 @@ function updateMO2PortConf {
 	writelog "INFO" "${FUNCNAME[0]} - Updating '$MYPORTDLDAT' with up to date data"
 
 	{
-		echo "GMO2EXE=\"$GMO2EXE\""
+		echo "GMO2EXE=\"$MO2EXE\""
 		echo "RUNPROTON=\"$RUNPROTON\""
+		echo "MO2PFX=\"$MO2PFX\""
+		echo "MO2WINE=\"$MO2WINE\""
+		echo "MO2INST=\"$MO2INST\""
 		echo "STEAM_COMPAT_CLIENT_INSTALL_PATH=\"$STEAM_COMPAT_CLIENT_INSTALL_PATH\""
 		echo "STEAM_COMPAT_DATA_PATH=\"$STEAM_COMPAT_DATA_PATH\""
 	} > "$MYPORTDLDAT"