mirror of
https://github.com/GameServerManagers/LinuxGSM.git
synced 2025-01-08 12:07:37 +08:00
feat: allow forks to use master branch (#3073)
The standard behaviour for master is that it uses the release/version number rather than the latest master. This is designed to prevent modules "version mixing" e.g alerts.sh being on v20.4.0 and alerts_discord.sh being v20.5.0. Version mixing can cause unpredictable behaviour and break installs. This solution will ensure that only the official the GameServerManagers repo uses this method. This allows forked repos to use custom code in master ignoring the release.
This commit is contained in:
parent
f0f0a56133
commit
a75ce429b5
@ -349,11 +349,12 @@ fn_fetch_file(){
|
||||
fn_fetch_file_github(){
|
||||
github_file_url_dir="${1}"
|
||||
github_file_url_name="${2}"
|
||||
# For legacy versions - code can be removed at a future date
|
||||
if [ "${legacymode}" == "1" ]; then
|
||||
# For legacy versions - code can be removed at a future date
|
||||
remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${github_file_url_name}"
|
||||
remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/${github_file_url_dir}/${github_file_url_name}"
|
||||
elif [ "${githubbranch}" == "master" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
|
||||
elif [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
else
|
||||
@ -376,7 +377,8 @@ fn_fetch_file_github(){
|
||||
fn_fetch_config(){
|
||||
github_file_url_dir="${1}"
|
||||
github_file_url_name="${2}"
|
||||
if [ "${githubbranch}" == "master" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
|
||||
if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
else
|
||||
@ -399,7 +401,8 @@ fn_fetch_config(){
|
||||
fn_fetch_function(){
|
||||
github_file_url_dir="lgsm/functions"
|
||||
github_file_url_name="${functionfile}"
|
||||
if [ "${githubbranch}" == "master" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
|
||||
if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
else
|
||||
@ -422,7 +425,8 @@ fn_fetch_function(){
|
||||
fn_update_function(){
|
||||
github_file_url_dir="lgsm/functions"
|
||||
github_file_url_name="${functionfile}"
|
||||
if [ "${githubbranch}" == "master" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
|
||||
if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
else
|
||||
|
@ -160,7 +160,8 @@ fn_bootstrap_fetch_file(){
|
||||
fn_bootstrap_fetch_file_github(){
|
||||
github_file_url_dir="${1}"
|
||||
github_file_url_name="${2}"
|
||||
if [ "${githubbranch}" == "master" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
|
||||
if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
else
|
||||
|
@ -167,7 +167,8 @@ fn_bootstrap_fetch_file(){
|
||||
fn_bootstrap_fetch_file_github(){
|
||||
github_file_url_dir="${1}"
|
||||
github_file_url_name="${2}"
|
||||
if [ "${githubbranch}" == "master" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
|
||||
if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
else
|
||||
|
@ -168,7 +168,8 @@ fn_bootstrap_fetch_file(){
|
||||
fn_bootstrap_fetch_file_github(){
|
||||
github_file_url_dir="${1}"
|
||||
github_file_url_name="${2}"
|
||||
if [ "${githubbranch}" == "master" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
|
||||
if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
else
|
||||
|
@ -168,7 +168,8 @@ fn_bootstrap_fetch_file(){
|
||||
fn_bootstrap_fetch_file_github(){
|
||||
github_file_url_dir="${1}"
|
||||
github_file_url_name="${2}"
|
||||
if [ "${githubbranch}" == "master" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
|
||||
if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
else
|
||||
|
@ -168,7 +168,8 @@ fn_bootstrap_fetch_file(){
|
||||
fn_bootstrap_fetch_file_github(){
|
||||
github_file_url_dir="${1}"
|
||||
github_file_url_name="${2}"
|
||||
if [ "${githubbranch}" == "master" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
|
||||
if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
|
||||
remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user