|
@@ -349,11 +349,12 @@ fn_fetch_file(){
|
|
|
fn_fetch_file_github(){
|
|
fn_fetch_file_github(){
|
|
|
github_file_url_dir="${1}"
|
|
github_file_url_dir="${1}"
|
|
|
github_file_url_name="${2}"
|
|
github_file_url_name="${2}"
|
|
|
|
|
+ # For legacy versions - code can be removed at a future date
|
|
|
if [ "${legacymode}" == "1" ]; then
|
|
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="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}"
|
|
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="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}"
|
|
remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
|
|
|
else
|
|
else
|
|
@@ -376,7 +377,8 @@ fn_fetch_file_github(){
|
|
|
fn_fetch_config(){
|
|
fn_fetch_config(){
|
|
|
github_file_url_dir="${1}"
|
|
github_file_url_dir="${1}"
|
|
|
github_file_url_name="${2}"
|
|
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="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}"
|
|
remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
|
|
|
else
|
|
else
|
|
@@ -399,7 +401,8 @@ fn_fetch_config(){
|
|
|
fn_fetch_function(){
|
|
fn_fetch_function(){
|
|
|
github_file_url_dir="lgsm/functions"
|
|
github_file_url_dir="lgsm/functions"
|
|
|
github_file_url_name="${functionfile}"
|
|
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="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}"
|
|
remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
|
|
|
else
|
|
else
|
|
@@ -422,7 +425,8 @@ fn_fetch_function(){
|
|
|
fn_update_function(){
|
|
fn_update_function(){
|
|
|
github_file_url_dir="lgsm/functions"
|
|
github_file_url_dir="lgsm/functions"
|
|
|
github_file_url_name="${functionfile}"
|
|
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="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}"
|
|
remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
|
|
|
else
|
|
else
|