-
-
Notifications
You must be signed in to change notification settings - Fork 854
feat: update various game server distro compatibility's #4853
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
4a30a5c
add compatabilty message
dgibbs64 dfefa51
failure
dgibbs64 e471d4b
Merge branch 'develop' into feature/ubuntu24
dgibbs64 21b5dbe
fix(serverlist): Update Vintage Story OS version to ubuntu-24.04
dgibbs64 c8bdfe0
fix(sven): Update dependencies
dgibbs64 465162a
fix(check_deps): Update support for Ubuntu and Debian versions
dgibbs64 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -351,6 +351,8 @@ if [ "${commandname}" == "INSTALL" ]; then | |
| fi | ||
| fi | ||
|
|
||
| info_distro.sh | ||
|
|
||
| # Will warn user if their distro is no longer supported by the vendor. | ||
| if [ -n "${distrosupport}" ]; then | ||
| if [ "${distrosupport}" == "unsupported" ]; then | ||
|
|
@@ -359,7 +361,23 @@ if [ -n "${distrosupport}" ]; then | |
| fi | ||
| fi | ||
|
|
||
| info_distro.sh | ||
| # These titles are only supported up to Ubuntu 22.04 (Jammy) and Debian 12 (Bookworm). | ||
| if { [ "${distroid}" == "ubuntu" ] && dpkg --compare-versions "${distroversion}" "gt" "22.04"; } || { [ "${distroidlike}" == "debian" ] && dpkg --compare-versions "${distroversion}" "gt" "12"; }; then | ||
| if [ "${shortname}" == "bf1942" ] || [ "${shortname}" == "bfv" ]; then | ||
| fn_print_failure_nl "${gamename} is not supported on ${distroname} (requires Ubuntu <= 22.04 or Debian <= 12)." | ||
| fn_script_log_fail "${gamename} is not supported on ${distroname}." | ||
| core_exit.sh | ||
| fi | ||
| fi | ||
|
|
||
| # These titles are only supported up to Ubuntu 20.04 and Debian 11 (and Debian-like derivatives). | ||
| if { [ "${distroid}" == "ubuntu" ] && dpkg --compare-versions "${distroversion}" "gt" "20.04"; } || { [ "${distroidlike}" == "debian" ] && dpkg --compare-versions "${distroversion}" "gt" "11"; }; then | ||
|
||
| if [ "${shortname}" == "onset" ] || [ "${shortname}" == "btl" ]; then | ||
| fn_print_failure_nl "${gamename} is not supported on ${distroname} (requires Ubuntu <= 20.04 or Debian <= 11)." | ||
| fn_script_log_fail "${gamename} is not supported on ${distroname}." | ||
| core_exit.sh | ||
| fi | ||
| fi | ||
|
|
||
| if [ ! -f "${tmpdir}/dependency-no-check.tmp" ] && [ ! -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then | ||
| # Check that the distro dependency csv file exists. | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Inconsistent use of
distroidlikeinstead ofdistroidfor Debian check. The variabledistroidlikerepresents derivative relationships (e.g., Ubuntu'sdistroidlikeis "debian"), not the actual distro ID. For actual Debian installations, this should checkdistroid == \"debian\"to properly detect Debian systems. The current logic may fail to detect actual Debian installations.