diff --git a/lang/chinese.txt b/lang/chinese.txt index cc4e7887..804c924d 100644 --- a/lang/chinese.txt +++ b/lang/chinese.txt @@ -1154,3 +1154,5 @@ GUI_CW_WINEGE="Wine-GE URL" DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" +GUI_DISABLEVORTEXAUTOUPDATE="Disable Vortex Auto Updates" +DESC_DISABLEVORTEXAUTOUPDATE="sets Vortex update channel to 'No automatic updates' which can help prevent breakages - if disabled, will set to stable/beta depending on value of 'USEVORTEXPRERELEASE' checkbox" diff --git a/lang/dutch.txt b/lang/dutch.txt index 14e4dd21..823a25b7 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -1154,3 +1154,5 @@ GUI_CW_WINEGE="Wine-GE URL" DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" +GUI_DISABLEVORTEXAUTOUPDATE="Disable Vortex Auto Updates" +DESC_DISABLEVORTEXAUTOUPDATE="sets Vortex update channel to 'No automatic updates' which can help prevent breakages - if disabled, will set to stable/beta depending on value of 'USEVORTEXPRERELEASE' checkbox" diff --git a/lang/english.txt b/lang/english.txt index b82bedbf..7884010c 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -1155,3 +1155,5 @@ GUI_CW_WINEGE="Wine-GE URL" DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" +GUI_DISABLEVORTEXAUTOUPDATE="Disable Vortex Auto Updates" +DESC_DISABLEVORTEXAUTOUPDATE="sets Vortex update channel to 'No automatic updates' which can help prevent breakages - if disabled, will set to stable/beta depending on value of 'USEVORTEXPRERELEASE' checkbox" diff --git a/lang/englishUK.txt b/lang/englishUK.txt index dd848baf..afda1886 100644 --- a/lang/englishUK.txt +++ b/lang/englishUK.txt @@ -1154,3 +1154,5 @@ GUI_CW_WINEGE="Wine-GE URL" DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" +GUI_DISABLEVORTEXAUTOUPDATE="Disable Vortex Auto Updates" +DESC_DISABLEVORTEXAUTOUPDATE="sets Vortex update channel to 'No automatic updates' which can help prevent breakages - if disabled, will set to stable/beta depending on value of 'USEVORTEXPRERELEASE' checkbox" diff --git a/lang/french.txt b/lang/french.txt index 49964b63..fb180462 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -1154,3 +1154,5 @@ GUI_CW_WINEGE="Wine-GE URL" DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" +GUI_DISABLEVORTEXAUTOUPDATE="Disable Vortex Auto Updates" +DESC_DISABLEVORTEXAUTOUPDATE="sets Vortex update channel to 'No automatic updates' which can help prevent breakages - if disabled, will set to stable/beta depending on value of 'USEVORTEXPRERELEASE' checkbox" diff --git a/lang/german.txt b/lang/german.txt index 848744c4..2cc31709 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -1156,3 +1156,5 @@ GUI_CW_WINEGE="Wine-GE URL" DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" +GUI_DISABLEVORTEXAUTOUPDATE="Disable Vortex Auto Updates" +DESC_DISABLEVORTEXAUTOUPDATE="sets Vortex update channel to 'No automatic updates' which can help prevent breakages - if disabled, will set to stable/beta depending on value of 'USEVORTEXPRERELEASE' checkbox" diff --git a/lang/italian.txt b/lang/italian.txt index cf3db215..f498be50 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -1154,3 +1154,5 @@ GUI_CW_WINEGE="Wine-GE URL" DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" +GUI_DISABLEVORTEXAUTOUPDATE="Disable Vortex Auto Updates" +DESC_DISABLEVORTEXAUTOUPDATE="sets Vortex update channel to 'No automatic updates' which can help prevent breakages - if disabled, will set to stable/beta depending on value of 'USEVORTEXPRERELEASE' checkbox" diff --git a/lang/polish.txt b/lang/polish.txt index 7ef003e4..7174a55c 100644 --- a/lang/polish.txt +++ b/lang/polish.txt @@ -1154,3 +1154,5 @@ GUI_CW_WINEGE="Wine-GE URL" DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" +GUI_DISABLEVORTEXAUTOUPDATE="Disable Vortex Auto Updates" +DESC_DISABLEVORTEXAUTOUPDATE="sets Vortex update channel to 'No automatic updates' which can help prevent breakages - if disabled, will set to stable/beta depending on value of 'USEVORTEXPRERELEASE' checkbox" diff --git a/lang/russian.txt b/lang/russian.txt index 3e50e817..3d9a0100 100644 --- a/lang/russian.txt +++ b/lang/russian.txt @@ -1154,3 +1154,5 @@ GUI_CW_WINEGE="Wine-GE URL" DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" +GUI_DISABLEVORTEXAUTOUPDATE="Disable Vortex Auto Updates" +DESC_DISABLEVORTEXAUTOUPDATE="sets Vortex update channel to 'No automatic updates' which can help prevent breakages - if disabled, will set to stable/beta depending on value of 'USEVORTEXPRERELEASE' checkbox" diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 9b4729cf..b22da56b 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -6,7 +6,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20230516-3" +PROGVERS="v14.0.20230516-4" PROGCMD="${0##*/}" SHOSTL="stl" GHURL="https://github.com" @@ -2661,6 +2661,7 @@ function setDefaultCfgValues { if [ -z "$VORTEXCOMPDATA" ] ; then VORTEXCOMPDATA="$STLVORTEXDIR/$CODA"; fi if [ -z "$VORTEXDOWNLOADPATH" ] ; then VORTEXDOWNLOADPATH="$STLVORTEXDIR/downloads"; fi if [ -z "$USEVORTEXPRERELEASE" ] ; then USEVORTEXPRERELEASE="0"; fi + if [ -z "$DISABLEVORTEXAUTOUPDATE" ] ; then DISABLEVORTEXAUTOUPDATE="0"; fi if [ -z "$DISABLE_AUTOSTAGES" ] ; then DISABLE_AUTOSTAGES="0"; fi if [ -z "$NOSTEAMSTLDEF" ] ; then NOSTEAMSTLDEF="0"; fi if [ -z "$SGDBAPIKEY" ] ; then SGDBAPIKEY="$NON"; fi @@ -3116,6 +3117,8 @@ function saveCfg { echo "VORTEXDOWNLOADPATH=\"$VORTEXDOWNLOADPATH\"" echo "## $DESC_USEVORTEXPRERELEASE" echo "USEVORTEXPRERELEASE=\"$USEVORTEXPRERELEASE\"" + echo "## $DESC_DISABLEVORTEXAUTOUPDATE" + echo "DISABLEVORTEXAUTOUPDATE=\"$DISABLEVORTEXAUTOUPDATE\"" echo "## $(strFix "$DESC_DISABLE_AUTOSTAGES" "$PROGNAME")" echo "DISABLE_AUTOSTAGES=\"$DISABLE_AUTOSTAGES\"" echo "## $DESC_NOSTEAMSTLDEF" @@ -5303,6 +5306,7 @@ function AllSettingsEntriesDummyFunction { --field=" $GUI_RUN_VORTEX_WINETRICKS!$DESC_RUN_VORTEX_WINETRICKS ('RUN_VORTEX_WINETRICKS')":CHK "${RUN_VORTEX_WINETRICKS/#-/ -}" `#CAT_Vortex` `#MENU_GAME` \ --field=" $GUI_RUN_VORTEX_WINECFG!$DESC_RUN_VORTEX_WINECFG ('RUN_VORTEX_WINECFG')":CHK "${RUN_VORTEX_WINECFG/#-/ -}" `#CAT_Vortex` `#MENU_GAME` \ --field=" $GUI_USEVORTEXPRERELEASE!$DESC_USEVORTEXPRERELEASE ('USEVORTEXPRERELEASE')":CHK "${USEVORTEXPRERELEASE/#-/ -}" `#CAT_Vortex` `#SUB_Checkbox` `#MENU_GLOBAL` \ +--field=" $GUI_DISABLEVORTEXAUTOUPDATE!$DESC_DISABLEVORTEXAUTOUPDATE ('DISABLEVORTEXAUTOUPDATE')":CHK "${DISABLEVORTEXAUTOUPDATE/#-/ -}" `#CAT_Vortex` `#SUB_Checkbox` `#MENU_GLOBAL` \ --field=" $GUI_VORTEXDOWNLOADPATH!$DESC_VORTEXDOWNLOADPATH ('VORTEXDOWNLOADPATH')":DIR "${VORTEXDOWNLOADPATH/#-/ -}" `#CAT_Vortex` `#SUB_Directories` `#MENU_GLOBAL` \ --field=" $GUI_VORTEXCOMPDATA!$DESC_VORTEXCOMPDATA ('VORTEXCOMPDATA')":DIR "${VORTEXCOMPDATA/#-/ -}" `#CAT_Vortex` `#SUB_Directories` `#MENU_GLOBAL` \ --field=" $GUI_USEVORTEXPROTON!$DESC_USEVORTEXPROTON ('USEVORTEXPROTON')":CB "$(cleanDropDown "${USEVORTEXPROTON/#-/ -}" "$PROTYADLIST")" `#CAT_Vortex` `#MENU_GLOBAL` \ @@ -14709,6 +14713,22 @@ function resetVortexSettings { diff -u "$STLSHM/vortsetbefore.txt" "$STLSHM/vortsetafter.txt" } +function setVortexReleaseChannel { + # Vortex settings.update.channel can be either 'stable', 'beta', or 'none' (where 'none' is 'No automatic updates') + VTXUPDATECHANNEL="stable" + if [ "$DISABLEVORTEXAUTOUPDATE" -eq 1 ]; then + VTXUPDATECHANNEL="none" + else + if [ "$USEVORTEXPRERELEASE" -eq 1 ]; then + VTXUPDATECHANNEL="beta" + else + VTXUPDATECHANNEL="stable" + fi + fi + + setVortSet "settings.update.channel=\"\\\"$VTXUPDATECHANNEL\\\"\"" +} + function startVortex { setVortexVars askVortex "$1" @@ -14734,6 +14754,7 @@ function startVortex { setVortexDLMime setVortexDLPath setVortexConfigVdf + setVortexReleaseChannel if [ -n "$2" ] && [ "$2" -eq "$2" ] 2>/dev/null; then StatusWindow "${VTX^}" "prepareVortexGame $2" "PrepareVortexGameStatus"