Skip to content

Commit f157a62

Browse files
authored
Merge pull request #4115 from GameServerManagers/feature/4099-version-branch-selector-bug
fix: selecting branch instead of version when getting modules
2 parents f21b5ca + ccb216e commit f157a62

File tree

4 files changed

+21
-258
lines changed

4 files changed

+21
-258
lines changed

linuxgsm.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
# Project: Linux Game Server Managers - LinuxGSM
33
# Author: Daniel Gibbs
4-
# License: MIT License, Copyright (c) 2020 Daniel Gibbs
4+
# License: MIT License, see LICENSE.md
55
# Purpose: Linux Game Server Management Script
66
# Contributors: https://linuxgsm.com/contrib
77
# Documentation: https://docs.linuxgsm.com
@@ -167,8 +167,8 @@ fn_bootstrap_fetch_file() {
167167
fn_bootstrap_fetch_file_github() {
168168
github_file_url_dir="${1}"
169169
github_file_url_name="${2}"
170-
# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
171-
if [ "${githubbranch}" == "master" ] && [ "${githubuser}" == "GameServerManager" ] && [ "${commandname}" != "UPDATE-LGSM" ]; then
170+
# By default modules will be downloaded from the version release to prevent potential version mixing. Only update-lgsm will allow an update.
171+
if [ "${githubbranch}" == "master" ] && [ "${githubuser}" == "GameServerManagers" ] && [ "${commandname}" != "UPDATE-LGSM" ]; then
172172
remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}"
173173
remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
174174
else
@@ -512,9 +512,4 @@ else
512512

513513
# Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off.
514514
fn_ansi_loader
515-
# Prevents running of core_exit.sh for Travis-CI.
516-
if [ "${travistest}" != "1" ]; then
517-
getopt=$1
518-
core_getopt.sh
519-
fi
520515
fi

package-lock.json

Lines changed: 18 additions & 204 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/tests_kcov.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

tests/tests_shellcheck.sh

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)