From 34aa1f2f96d4a8e1a6e40455e0efd13fffa0798e Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Tue, 16 Jan 2024 01:21:16 +0000 Subject: [PATCH 1/5] ModOrganizer 2: Prevent MO2MODE from being 'none', only checkMO2 if MO2MODE is 'GUI' --- steamtinkerlaunch | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index be248ca3..34145080 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -6,7 +6,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20240116-2" +PROGVERS="v14.0.20240116-3" PROGCMD="${0##*/}" PROGINTERNALPROTNAME="Proton-stl" SHOSTL="stl" @@ -6958,6 +6958,14 @@ function migrateCfgOption { updateConfigEntry "SPEKVERS" "$SPEKVERS" "$STLGAMECFG" fi + # stop MO2MODE from being 'none' in weird scenarios + if [ "$MO2MODE" == "$NON" ]; then + MO2MODE="disabled" + touch "$FUPDATE" + writelog "SKIP" "${FUNCNAME[0]} - ModOrganizer 2 variable MO2MODE is somehow '$NON' -- Defaulting this to 'disabled'" + updateConfigEntry "MO2MODE" "$MO2MODE" "$STLGAMECFG" + fi + # collections update if [ -n "$CHECKCATEGORIES" ] && [ "$CHECKCATEGORIES" -eq 1 ]; then CHECKCOLLECTIONS="$CHECKCATEGORIES" @@ -17567,7 +17575,14 @@ function setMO2DLMime { } function checkMO2 { - if [ "$MO2MODE" != "disabled" ]; then + # migrateCfgOption should mean this never happens, but can never be too careful -- Has begun happening since 12/01/2024 for a small number of Steam Deck users + if [ "$MO2MODE" == "$NON" ]; then + writelog "SKIP" "${FUNCNAME[0]} - MO2MODE is '$NON' -- This should not happen but has been observed in the wild, so explicitly returning here" + return + fi + + # if [ "$MO2MODE" != "disabled" ]; then # This check is because MO2 was once planned to have a silent mode, but no idea if/when this will be implemented, so just explicitly check for GUI + if [ "$MO2MODE" == "gui" ]; then writelog "INFO" "${FUNCNAME[0]} - MO2MODE is '$MO2MODE' - starting MO2" if [ "$WAITMO2" -gt 0 ]; then From 36ee60d76259e04731509ae524e23d8c5163cb91 Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Tue, 16 Jan 2024 01:43:10 +0000 Subject: [PATCH 2/5] ModOrganizer 2: Default silent mode to 'gui', exit checkMO2 early on MO2MODE = disabled --- steamtinkerlaunch | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 34145080..3d1f9889 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -6,7 +6,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20240116-3" +PROGVERS="v14.0.20240116-4 (mo2-migrate-none)" PROGCMD="${0##*/}" PROGINTERNALPROTNAME="Proton-stl" SHOSTL="stl" @@ -6962,7 +6962,7 @@ function migrateCfgOption { if [ "$MO2MODE" == "$NON" ]; then MO2MODE="disabled" touch "$FUPDATE" - writelog "SKIP" "${FUNCNAME[0]} - ModOrganizer 2 variable MO2MODE is somehow '$NON' -- Defaulting this to 'disabled'" + writelog "INFO" "${FUNCNAME[0]} - ModOrganizer 2 variable MO2MODE is somehow '$NON' -- Defaulting this to 'disabled'" updateConfigEntry "MO2MODE" "$MO2MODE" "$STLGAMECFG" fi @@ -17581,6 +17581,11 @@ function checkMO2 { return fi + if [ "$MO2MODE" == "disabled" ]; then + writelog "SKIP" "${FUNCNAME[0]} - MO2MODE is 'disabled' -- Skipping checkMO2!" + return + fi + # if [ "$MO2MODE" != "disabled" ]; then # This check is because MO2 was once planned to have a silent mode, but no idea if/when this will be implemented, so just explicitly check for GUI if [ "$MO2MODE" == "gui" ]; then writelog "INFO" "${FUNCNAME[0]} - MO2MODE is '$MO2MODE' - starting MO2" @@ -17609,8 +17614,8 @@ function checkMO2 { } ;; 4) { - writelog "INFO" "${FUNCNAME[0]} - Selected to start $MO with mods silently" - MO2MODE="silent" + writelog "INFO" "${FUNCNAME[0]} - Selected to start $MO with mods silently -- defaulting to gui since silent mode is not implemented" + MO2MODE="gui" } ;; 6) { From cb6f242fe34bdb16cf796942741c358f01076e59 Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Tue, 16 Jan 2024 01:55:50 +0000 Subject: [PATCH 3/5] ModOrganizer 2: Additional logging --- steamtinkerlaunch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 3d1f9889..6e56dbd5 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -6,7 +6,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20240116-4 (mo2-migrate-none)" +PROGVERS="v14.0.20240116-5 (mo2-migrate-none)" PROGCMD="${0##*/}" PROGINTERNALPROTNAME="Proton-stl" SHOSTL="stl" @@ -17637,6 +17637,8 @@ function checkMO2 { writelog "INFO" "${FUNCNAME[0]} - Disabling custom command, because $MO2 is enabled" USECUSTOMCMD=0 fi + else + writelog "WARN" "${FUNCNAME[0]} - Unknown MO2MODE value '$MO2MODE' -- This is safe as checkMO2 has been skipped, but it is still unusual" fi } From b03c111e44839db57b58d3d7707c24ec2f02de16 Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Fri, 19 Jan 2024 00:45:53 +0000 Subject: [PATCH 4/5] version bump --- steamtinkerlaunch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 6e56dbd5..299d2089 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -6,7 +6,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20240116-5 (mo2-migrate-none)" +PROGVERS="v14.0.20240116-5" PROGCMD="${0##*/}" PROGINTERNALPROTNAME="Proton-stl" SHOSTL="stl" @@ -6958,7 +6958,7 @@ function migrateCfgOption { updateConfigEntry "SPEKVERS" "$SPEKVERS" "$STLGAMECFG" fi - # stop MO2MODE from being 'none' in weird scenarios + # stop MO2MODE from being 'none' in weird scenarios -- Issue was confirmed to be exclusive to SteamOS and may be a (temporary?) SteamOS regression if [ "$MO2MODE" == "$NON" ]; then MO2MODE="disabled" touch "$FUPDATE" From bd11069473a739f8be6c8cdd0415fb600ca5672a Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Fri, 19 Jan 2024 00:46:18 +0000 Subject: [PATCH 5/5] actual version bump --- steamtinkerlaunch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 299d2089..43d03bbb 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -6,7 +6,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20240116-5" +PROGVERS="v14.0.20240119-1" PROGCMD="${0##*/}" PROGINTERNALPROTNAME="Proton-stl" SHOSTL="stl"