Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vortex: Gate Pre-Release Installation Behind Checkbox #802

Merged
merged 2 commits into from
May 14, 2023
Merged

Vortex: Gate Pre-Release Installation Behind Checkbox #802

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e887ae9
Vortex: Add logic to only download latest stable/pre-release versions
sonic2kk May 14, 2023
a8c87df
Version bump
sonic2kk May 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions steamtinkerlaunch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
PREFIX="/usr"
PROGNAME="SteamTinkerLaunch"
NICEPROGNAME="Steam Tinker Launch"
PROGVERS="v14.0.20230509-2"
PROGVERS="v14.0.20230515-1"
PROGCMD="${0##*/}"
SHOSTL="stl"
GHURL="https://github.com"
Expand Down Expand Up @@ -5302,7 +5302,7 @@ function AllSettingsEntriesDummyFunction {
--field=" $GUI_WAITVORTEX!$DESC_WAITVORTEX ('WAITVORTEX')":NUM "${WAITVORTEX/#-/ -}" `#CAT_Vortex` `#MENU_GAME` \
--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!$DESCUSEVORTEXPRERELEASE ('USEVORTEXPRERELEASE')":CHK "${USEVORTEXPRERELEASE/#-/ -}" `#CAT_Vortex` `#SUB_Checkbox` `#MENU_GLOBAL` \
--field=" $GUI_USEVORTEXPRERELEASE!$DESC_USEVORTEXPRERELEASE ('USEVORTEXPRERELEASE')":CHK "${USEVORTEXPRERELEASE/#-/ -}" `#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` \
Expand Down Expand Up @@ -13919,10 +13919,15 @@ function createHMMDesktopFile {
function getLatestGitHubExeVer {
SETUPNAME="$1"
PROJURL="$2"
EXCLUDEPRERELEASES="${3:-0}" # i.e. to only get latest stable Vortex

RELEASESURL="${PROJURL}/releases"
EXPANDEDASSETSURL="${RELEASESURL}/expanded_assets"
TAGSURL="${PROJURL}/tags"
if [ "$EXCLUDEPRERELEASES" -eq 1 ]; then
TAGSURL="${RELEASESURL}/latest" # Will redirect to release tagged with "latest" instead of pre-release
else
TAGSURL="${PROJURL}/tags"
fi

TAGSGREP="${RELEASESURL#"$GHURL"}/tag"

Expand Down Expand Up @@ -14037,10 +14042,16 @@ function setVortexDLMime {
fi
}

# Get beta Vortex (rename function to "getBetaVortVer"?)
function getLatestVortVer {
VSET="$VTX-setup"
writelog "INFO" "${FUNCNAME[0]} - Search for latest ${VTX^} stable Release"
VORTEXSETUP="$(getLatestGitHubExeVer "$VSET" "$VORTEXPROJURL")"
if [ "$USEVORTEXPRERELEASE" -eq 1 ]; then
writelog "INFO" "${FUNCNAME[0]} - Search for latest ${VTX^} Beta Release, if one is available (will fall back to Stable by default)"
VORTEXSETUP="$(getLatestGitHubExeVer "$VSET" "$VORTEXPROJURL" )"
else
writelog "INFO" "${FUNCNAME[0]} - Search for latest ${VTX^} Stable Release"
VORTEXSETUP="$(getLatestGitHubExeVer "$VSET" "$VORTEXPROJURL" "1" )"
fi
writelog "INFO" "${FUNCNAME[0]} - Found '$VORTEXSETUP'"
echo "VORTEXSETUP=$VORTEXSETUP" > "$VTST"
}
Expand Down