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.

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

trim Proton beta and rc versioning (fixes #1094) #1101

Merged
merged 1 commit into from
May 3, 2024

Conversation

VoodooHillbilly
Copy link
Contributor

@VoodooHillbilly VoodooHillbilly commented May 3, 2024

When ONLYPROTMAJORREDIRECT is enabled, beta and release candidate versioning will not be included in new Proton compatdata names.

When ONLYPROTMAJORREDIRECT is enabled, beta and release candidate versioning will be removed from Proton compatdata names.
@VoodooHillbilly VoodooHillbilly changed the title fix: trim Proton beta and rc versioning trim Proton beta and rc versioning (fixes #1094) May 3, 2024
@sonic2kk
Copy link
Owner

sonic2kk commented May 3, 2024

Did a quick test with this patch applied locally, works as expected based on discussion in #1094.

Tested with "Halo: The Master Chief Collection" and a global compatdata redirect with ONLYPROTMAJORREDIRECT=1, and it created compatdata-proton-9.0 at ~/.config/steamtinkerlaunch/proton/compatdata/ as expected.

As you mentioned in #1094 (comment), there is indeed no longer a Proton Beta or Release Candidate to test with here. However, I tested this in a Bash prompt with the following, and it returned the correct trimming results.

function trimProtBetaRC {
    printf '%s' "${1}" | sed -e 's/-\(rc\|beta\)[0-9]\+$//' -e 's/-[0-9A-Za-z_]\+$//'
}

# proton-8.0
trimProtBetaRC "proton-8.0-3c"

# proton-9.0
trimProtBetaRC "proton-9.0-1"

# proton-9.0
trimProtBetaRC "proton-9.0-1-rc2"

# This was a sneaky one ;-)
# proton-10.0
trimProtBetaRC "proton-10.0-beta16"

# GE-Proton9
trimProtBetaRC "GE-Proton9-4"

This looks good to merge to me. Thanks!

@sonic2kk sonic2kk merged commit d2f953b into sonic2kk:master May 3, 2024
1 check passed
@sonic2kk
Copy link
Owner

sonic2kk commented May 3, 2024

Changelog has been updated to give credit for this change, under "Fixes": https://github.com/sonic2kk/steamtinkerlaunch/wiki/Changelog

Thanks again!

@VoodooHillbilly
Copy link
Contributor Author

And... I forgot to edit my commit message to match the edited PR message. Oh well, at least I finally managed to make the PR. Maybe it'll help next time there's a beta/rc version.

@sonic2kk
Copy link
Owner

sonic2kk commented May 4, 2024

It's all good :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ONLYPROTMAJORREDIRECT doesn't properly handle latest Proton 9.0 Beta
2 participants