From ee8d30f7060818ad430ac9e4b30e1d61369a5d21 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 16 Sep 2024 22:43:44 +0100 Subject: [PATCH 01/17] feat(ro): Migrate to using valve query by default --- .../config-lgsm/roserver/_default.cfg | 2 +- .../modules/command_dev_parse_game_details.sh | 8 ++--- lgsm/modules/core_messages.sh | 2 +- lgsm/modules/info_game.sh | 36 +++++++++---------- lgsm/modules/info_messages.sh | 19 +++++----- 5 files changed, 33 insertions(+), 34 deletions(-) diff --git a/lgsm/config-default/config-lgsm/roserver/_default.cfg b/lgsm/config-default/config-lgsm/roserver/_default.cfg index c000f6181..0af49a0d4 100644 --- a/lgsm/config-default/config-lgsm/roserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/roserver/_default.cfg @@ -142,7 +142,7 @@ stopmode="2" # 4: gsquery # 5: tcp querymode="2" -querytype="protocol-unreal2" +querytype="protocol-valve" ## Console type consoleverbose="yes" diff --git a/lgsm/modules/command_dev_parse_game_details.sh b/lgsm/modules/command_dev_parse_game_details.sh index 2e22aa7ae..5938f817d 100644 --- a/lgsm/modules/command_dev_parse_game_details.sh +++ b/lgsm/modules/command_dev_parse_game_details.sh @@ -74,12 +74,12 @@ declare -A server_details=( ['Port IPv6']="${portipv6}" ['Port']="${port}" ['Query Enabled']="${queryenabled}" - ['Query HTTP Port']="${queryhttpport}" - ['Query HTTPS Port']="${queryhttpsport}" + ['Query HTTP Port']="${httpqueryport}" + ['Query HTTPS Port']="${httpsqueryport}" ['Query Mode']="${querymode}" - ['Query Port GS']="${queryportgs}" + ['Query Port GS']="${gamespyqueryport}" ['Query Port']="${queryport}" - ['Query SSH Port']="${querysshport}" + ['Query SSH Port']="${sshqueryport}" ['Queue Enabled']="${queueenabled}" ['Queue Port']="${queueport}" ['Random Map']="${randommap}" diff --git a/lgsm/modules/core_messages.sh b/lgsm/modules/core_messages.sh index 6488c02bc..52129dc4b 100644 --- a/lgsm/modules/core_messages.sh +++ b/lgsm/modules/core_messages.sh @@ -31,7 +31,7 @@ fn_ansi_loader() { darkgrey="\e[90m" lightgrey="\e[37m" white="\e[97m" - # erase to end of line. + # erase to end of line. creeol+="\033[K" fi } diff --git a/lgsm/modules/info_game.sh b/lgsm/modules/info_game.sh index d56d4fbff..5875627ca 100644 --- a/lgsm/modules/info_game.sh +++ b/lgsm/modules/info_game.sh @@ -496,7 +496,7 @@ fn_info_game_kf() { fn_info_game_ini "lanport" "LANServerPort" fn_info_game_ini "maxplayers" "MaxPlayers" fn_info_game_ini "port" "Port" - fn_info_game_ini "queryportgs" "QueryPort" + fn_info_game_ini "gamespyqueryport" "QueryPort" fn_info_game_ini "servername" "ServerName" fn_info_game_ini "serverpassword" "GamePassword" fi @@ -510,7 +510,7 @@ fn_info_game_kf() { maxplayers="${maxplayers:-"0"}" port="${port:-"0"}" queryport="$((port + 1))" - queryportgs="${queryportgs:-"0"}" + gamespyqueryport="${gamespyqueryport:-"0"}" servername="${servername:-"NOT SET"}" serverpassword="${serverpassword:-"NOT SET"}" steamport="28852" @@ -754,19 +754,19 @@ fn_info_game_ts3() { fn_info_game_ini "dbplugin" "dbplugin" fn_info_game_ini "fileport" "filetransfer_port" fn_info_game_ini "port" "default_voice_port" - fn_info_game_ini "queryhttpport" "query_http_port" - fn_info_game_ini "queryhttpsport" "query_https_port" + fn_info_game_ini "httpqueryport" "query_http_port" + fn_info_game_ini "httpsqueryport" "query_https_port" fn_info_game_ini "queryport" "query_port" - fn_info_game_ini "querysshport" "query_ssh_port" + fn_info_game_ini "sshqueryport" "query_ssh_port" fi configip="${configip:-"0.0.0.0"}" dbplugin="${dbplugin:-"NOT SET"}" fileport="${fileport:-"0"}" port="${port:-"0"}" - queryhttpport="${queryhttpport:-"0"}" - queryhttpsport="${queryhttpsport:-"0"}" + httpqueryport="${httpqueryport:-"0"}" + httpsqueryport="${httpsqueryport:-"0"}" queryport="${queryport:-"0"}" - querysshport="${querysshport:-"0"}" + sshqueryport="${sshqueryport:-"0"}" telnetport="${queryport}" } @@ -797,7 +797,7 @@ fn_info_game_ut99() { fn_info_game_ini "adminpassword" "AdminPassword" fn_info_game_ini "beaconport" "ServerBeaconPort" fn_info_game_ini "port" "Port" - fn_info_game_ini "queryportgs" "OldQueryPortNumber" + fn_info_game_ini "gamespyqueryport" "OldQueryPortNumber" fn_info_game_ini "servername" "ServerName" fn_info_game_ini "serverpassword" "GamePassword" fn_info_game_ini "httpenabled" "bEnabled" @@ -811,7 +811,7 @@ fn_info_game_ut99() { httpport="${httpport:-"0"}" port="${port:-"0"}" queryport="$((port + 1))" - queryportgs="${queryportgs:-"0"}" + gamespyqueryport="${gamespyqueryport:-"0"}" servername="${servername:-"NOT SET"}" serverpassword="${serverpassword:-"NOT SET"}" httpenabled="${httpenabled:-"0"}" @@ -857,7 +857,7 @@ fn_info_game_unreal2() { fn_info_game_ini "adminpassword" "AdminPassword" fn_info_game_ini "httpport" "ListenPort" fn_info_game_ini "port" "Port" - fn_info_game_ini "queryportgs" "OldQueryPortNumber" + fn_info_game_ini "gamespyqueryport" "OldQueryPortNumber" fn_info_game_ini "servername" "ServerName" fn_info_game_ini "serverpassword" "GamePassword" fn_info_game_ini "httpenabled" "bEnabled" @@ -868,7 +868,7 @@ fn_info_game_unreal2() { httpport="${httpport:-"0"}" port="${port:-"0"}" queryport="$((port + 1))" - queryportgs="${queryportgs:-"0"}" + gamespyqueryport="${gamespyqueryport:-"0"}" servername="${servername:-"NOT SET"}" serverpassword="${serverpassword:-"NOT SET"}" httpenabled="${httpenabled:-"0"}" @@ -902,7 +902,7 @@ fn_info_game_ut2k4() { fn_info_game_ini "httpport" "ListenPort" fn_info_game_ini "lanport" "LANServerPort" fn_info_game_ini "port" "Port" - fn_info_game_ini "queryportgs" "OldQueryPortNumber" + fn_info_game_ini "gamespyqueryport" "OldQueryPortNumber" fn_info_game_ini "servername" "ServerName" fn_info_game_ini "serverpassword" "GamePassword" fn_info_game_ini "httpenabled" "bEnabled" @@ -914,7 +914,7 @@ fn_info_game_ut2k4() { lanport="${lanport:-"0"}" port="${port:-"0"}" queryport="$((port + 1))" - queryportgs="${queryportgs:-"0"}" + gamespyqueryport="${gamespyqueryport:-"0"}" servername="${servername:-"NOT SET"}" serverpassword="${serverpassword:-"NOT SET"}" httpenabled="${httpenabled:-"0"}" @@ -1771,7 +1771,6 @@ fn_info_game_ro() { fn_info_game_ini "lanport" "LANServerPort" fn_info_game_ini "maxplayers" "MaxPlayers" fn_info_game_ini "port" "Port" - fn_info_game_ini "queryportgs" "QueryPort" fn_info_game_ini "servername" "ServerName" fn_info_game_ini "serverpassword" "GamePassword" fi @@ -1784,12 +1783,11 @@ fn_info_game_ro() { lanport="${lanport:-"0"}" maxplayers="${maxplayers:-"0"}" port="${port:-"0"}" - queryport="$((port + 1))" - queryportgs="${queryportgs:-"0"}" + queryport=$((28902 + (port - 7757))) # Valve Query Port servername="${servername:-"NOT SET"}" serverpassword="${serverpassword:-"NOT SET"}" - steamport="28902" - steamworksport="20610" + steamport="20610" + unreal2queryport="$((port + 1))" # Unreal2 Query Port } # Config Type: QuakeC diff --git a/lgsm/modules/info_messages.sh b/lgsm/modules/info_messages.sh index 0bc444e5e..94c192361 100644 --- a/lgsm/modules/info_messages.sh +++ b/lgsm/modules/info_messages.sh @@ -832,7 +832,7 @@ fn_info_messages_armar() { { fn_port "header" fn_port "Game" port udp - fn_port "Steam Query" queryport udp + fn_port "Query" queryport udp fn_port "BattleEye" battleeyeport tcp } | column -s $'\t' -t } @@ -1130,7 +1130,7 @@ fn_info_messages_kf() { fn_port "header" fn_port "Game" port udp fn_port "Query" queryport udp - fn_port "Query (GameSpy)" queryportgs udp + fn_port "Query (GameSpy)" gamespyqueryport udp fn_port "Web Interface" httpport tcp fn_port "LAN" lanport udp fn_port "Steamworks P2P" steamworksport udp @@ -1343,11 +1343,12 @@ fn_info_messages_ro() { { fn_port "header" fn_port "Game" port udp - fn_port "Query" queryport udp + fn_port "Query - Steam" queryport udp + fn_port "Query - Unreal 2" unreal2queryport udp fn_port "Web Interface" httpport tcp fn_port "LAN" lanport udp - fn_port "Steamworks P2P" steamworksport udp fn_port "Steam" steamport udp + } | column -s $'\t' -t echo -e "" echo -e "${bold}${lightgreen}${servername} Web Interface${default}" @@ -1504,7 +1505,7 @@ fn_info_messages_source() { fn_port "Query" queryport tcp fn_port "RCON" rconport tcp fn_port "SourceTV" sourcetvport udp - # Will not show if unaviable + # Will not show if unavailable if [ "${steamport}" == "0" ] || [ -v "${steamport}" ]; then fn_port "Steam" steamport udp fi @@ -1570,9 +1571,9 @@ fn_info_messages_ts3() { fn_port "header" fn_port "Voice" port udp fn_port "Query" queryport tcp - fn_port "Query (SSH)" querysshport tcp - fn_port "Query (http)" queryhttpport tcp - fn_port "Query (https)" queryhttpsport tcp + fn_port "Query (SSH)" sshqueryport tcp + fn_port "Query (http)" httpqueryport tcp + fn_port "Query (https)" httpsqueryport tcp fn_port "File Transfer" fileport tcp fn_port "Telnet" telnetport tcp } | column -s $'\t' -t @@ -1618,7 +1619,7 @@ fn_info_messages_ut2k4() { fn_port "header" fn_port "Game" port udp fn_port "Query" queryport udp - fn_port "Query (GameSpy)" queryportgs udp + fn_port "Query (GameSpy)" gamespyqueryport udp fn_port "Web Interface" httpport tcp fn_port "LAN" lanport udp } | column -s $'\t' -t From 8032eca4b1ea17fb40efb7ada9617eafb4a5fd15 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 21 Sep 2024 23:22:07 +0100 Subject: [PATCH 02/17] feat(kf): Migrate to using valve query --- .../config-lgsm/kfserver/_default.cfg | 2 +- lgsm/modules/info_game.sh | 15 ++++++++++----- lgsm/modules/info_messages.sh | 6 +++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lgsm/config-default/config-lgsm/kfserver/_default.cfg b/lgsm/config-default/config-lgsm/kfserver/_default.cfg index d9df57d3e..222ba9979 100644 --- a/lgsm/config-default/config-lgsm/kfserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/kfserver/_default.cfg @@ -146,7 +146,7 @@ stopmode="2" # 4: gsquery # 5: tcp querymode="2" -querytype="protocol-unreal2" +querytype="protocol-valve" ## Console type consoleverbose="yes" diff --git a/lgsm/modules/info_game.sh b/lgsm/modules/info_game.sh index 5875627ca..8496f078f 100644 --- a/lgsm/modules/info_game.sh +++ b/lgsm/modules/info_game.sh @@ -496,12 +496,13 @@ fn_info_game_kf() { fn_info_game_ini "lanport" "LANServerPort" fn_info_game_ini "maxplayers" "MaxPlayers" fn_info_game_ini "port" "Port" - fn_info_game_ini "gamespyqueryport" "QueryPort" + fn_info_game_ini "gamespyqueryport" "OldQueryPortNumber" fn_info_game_ini "servername" "ServerName" fn_info_game_ini "serverpassword" "GamePassword" fi adminpassword="${adminpassword:-"NOT SET"}" defaultmap="${defaultmap:-"NOT SET"}" + gamespyqueryport="${gamespyqueryport:-"0"}" # Gamespy Query Port httpenabled="${httpenabled:-"NOT SET"}" httppassword="${adminpassword}" httpport="${httpport:-"0"}" @@ -509,12 +510,11 @@ fn_info_game_kf() { lanport="${lanport:-"0"}" maxplayers="${maxplayers:-"0"}" port="${port:-"0"}" - queryport="$((port + 1))" - gamespyqueryport="${gamespyqueryport:-"0"}" + queryport=$((28902 + (port - 7757))) # Valve Query Port servername="${servername:-"NOT SET"}" serverpassword="${serverpassword:-"NOT SET"}" - steamport="28852" - steamworksport="20560" + steamport="20610" + unreal2queryport="$((port + 1))" # Unreal2 Query Port } # Config Type: ini @@ -1761,6 +1761,11 @@ fn_info_game_qw() { servername="${servername:-"NOT SET"}" } +# Config Type: ini +# Parameters: true +# Comment: ; or # +# Example: ServerName=SERVERNAME +# Filetype: ini fn_info_game_ro() { if [ -f "${servercfgfullpath}" ]; then fn_info_game_ini "adminpassword" "AdminPassword" diff --git a/lgsm/modules/info_messages.sh b/lgsm/modules/info_messages.sh index 94c192361..b3fb5f47d 100644 --- a/lgsm/modules/info_messages.sh +++ b/lgsm/modules/info_messages.sh @@ -1129,11 +1129,11 @@ fn_info_messages_kf() { { fn_port "header" fn_port "Game" port udp - fn_port "Query" queryport udp - fn_port "Query (GameSpy)" gamespyqueryport udp + fn_port "Query - Steam" queryport udp + fn_port "Query - Unreal 2" unreal2queryport udp + fn_port "Query - Gamespy" gamespyqueryport udp fn_port "Web Interface" httpport tcp fn_port "LAN" lanport udp - fn_port "Steamworks P2P" steamworksport udp fn_port "Steam" steamport udp } | column -s $'\t' -t echo -e "" From 93ecefbc42a81b9902ccfa8e66d3a6941d03c66d Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 21 Sep 2024 23:35:34 +0100 Subject: [PATCH 03/17] feat(ut2k4): Update details to match other unreal 2 servers --- lgsm/modules/info_messages.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/modules/info_messages.sh b/lgsm/modules/info_messages.sh index b3fb5f47d..7f40c8312 100644 --- a/lgsm/modules/info_messages.sh +++ b/lgsm/modules/info_messages.sh @@ -1618,8 +1618,8 @@ fn_info_messages_ut2k4() { { fn_port "header" fn_port "Game" port udp - fn_port "Query" queryport udp - fn_port "Query (GameSpy)" gamespyqueryport udp + fn_port "Query - Unreal 2" queryport udp + fn_port "Query - Gamespy" gamespyqueryport udp fn_port "Web Interface" httpport tcp fn_port "LAN" lanport udp } | column -s $'\t' -t From fdde2de54a0ab8ebe1cbcf31d99122376414c1fd Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Sep 2024 10:41:30 +0100 Subject: [PATCH 04/17] chore: update distro versions --- .github/ISSUE_TEMPLATE/bug_report.yml | 6 +----- .github/ISSUE_TEMPLATE/feature_request.yml | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 2b339d122..e9f2d000b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -30,17 +30,13 @@ body: label: Linux distro multiple: true options: + - Ubuntu 24.04 - Ubuntu 22.04 - Ubuntu 20.04 - - Ubuntu 18.04 - - Ubuntu 16.04 - Debian 12 - Debian 11 - - Debian 10 - - Debian 9 - RedHat 9 - RedHat 8 - - RedHat 7 - Other validations: required: true diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 45aced3d1..f1a8ccaf6 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -30,17 +30,13 @@ body: label: Linux distro multiple: true options: + - Ubuntu 24.04 - Ubuntu 22.04 - Ubuntu 20.04 - - Ubuntu 18.04 - - Ubuntu 16.04 - Debian 12 - Debian 11 - - Debian 10 - - Debian 9 - RedHat 9 - RedHat 8 - - RedHat 7 - Other validations: required: false From f5369ca901ac68df8d32e51d2b256a9744e36750 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Sep 2024 10:44:41 +0100 Subject: [PATCH 05/17] fix: Change http to https in comment --- lgsm/modules/alert.sh | 2 +- lgsm/modules/alert_discord.sh | 2 +- lgsm/modules/alert_email.sh | 2 +- lgsm/modules/alert_gotify.sh | 2 +- lgsm/modules/alert_ifttt.sh | 2 +- lgsm/modules/alert_pushbullet.sh | 2 +- lgsm/modules/alert_pushover.sh | 2 +- lgsm/modules/alert_rocketchat.sh | 2 +- lgsm/modules/alert_slack.sh | 2 +- lgsm/modules/alert_telegram.sh | 2 +- lgsm/modules/check.sh | 2 +- lgsm/modules/check_config.sh | 2 +- lgsm/modules/check_deps.sh | 2 +- lgsm/modules/check_executable.sh | 2 +- lgsm/modules/check_gamedig.sh | 2 +- lgsm/modules/check_glibc.sh | 2 +- lgsm/modules/check_ip.sh | 2 +- lgsm/modules/check_last_update.sh | 2 +- lgsm/modules/check_logs.sh | 2 +- lgsm/modules/check_permissions.sh | 2 +- lgsm/modules/check_root.sh | 2 +- lgsm/modules/check_status.sh | 2 +- lgsm/modules/check_steamcmd.sh | 2 +- lgsm/modules/check_system_dir.sh | 2 +- lgsm/modules/check_system_requirements.sh | 2 +- lgsm/modules/check_tmuxception.sh | 2 +- lgsm/modules/check_version.sh | 2 +- lgsm/modules/command_backup.sh | 2 +- lgsm/modules/command_check_update.sh | 2 +- lgsm/modules/command_console.sh | 2 +- lgsm/modules/command_debug.sh | 2 +- lgsm/modules/command_details.sh | 2 +- lgsm/modules/command_dev_clear_modules.sh | 2 +- lgsm/modules/command_dev_debug.sh | 2 +- lgsm/modules/command_dev_detect_deps.sh | 2 +- lgsm/modules/command_dev_detect_glibc.sh | 2 +- lgsm/modules/command_dev_detect_ldd.sh | 2 +- .../command_dev_parse_distro_details.sh | 20 +++++++++---------- .../modules/command_dev_parse_game_details.sh | 2 +- lgsm/modules/command_dev_query_raw.sh | 2 +- lgsm/modules/command_fastdl.sh | 2 +- lgsm/modules/command_install.sh | 2 +- lgsm/modules/command_install_resources_mta.sh | 2 +- lgsm/modules/command_mods_install.sh | 2 +- lgsm/modules/command_mods_remove.sh | 2 +- lgsm/modules/command_mods_update.sh | 2 +- lgsm/modules/command_monitor.sh | 2 +- lgsm/modules/command_postdetails.sh | 2 +- lgsm/modules/command_restart.sh | 2 +- lgsm/modules/command_send.sh | 2 +- lgsm/modules/command_skeleton.sh | 2 +- lgsm/modules/command_sponsor.sh | 2 +- lgsm/modules/command_start.sh | 2 +- lgsm/modules/command_stop.sh | 2 +- lgsm/modules/command_test_alert.sh | 2 +- lgsm/modules/command_ts3_server_pass.sh | 2 +- lgsm/modules/command_update.sh | 2 +- lgsm/modules/command_update_linuxgsm.sh | 2 +- lgsm/modules/command_validate.sh | 2 +- lgsm/modules/command_wipe.sh | 2 +- lgsm/modules/compress_unreal2_maps.sh | 2 +- lgsm/modules/compress_ut99_maps.sh | 2 +- lgsm/modules/core_dl.sh | 2 +- lgsm/modules/core_exit.sh | 2 +- lgsm/modules/core_getopt.sh | 2 +- lgsm/modules/core_github.sh | 2 +- lgsm/modules/core_legacy.sh | 2 +- lgsm/modules/core_logs.sh | 2 +- lgsm/modules/core_messages.sh | 2 +- lgsm/modules/core_modules.sh | 2 +- lgsm/modules/core_steamcmd.sh | 2 +- lgsm/modules/core_trap.sh | 2 +- lgsm/modules/fix.sh | 2 +- lgsm/modules/fix_ark.sh | 2 +- lgsm/modules/fix_arma3.sh | 2 +- lgsm/modules/fix_armar.sh | 2 +- lgsm/modules/fix_av.sh | 2 +- lgsm/modules/fix_bo.sh | 2 +- lgsm/modules/fix_bt.sh | 2 +- lgsm/modules/fix_cmw.sh | 2 +- lgsm/modules/fix_csgo.sh | 2 +- lgsm/modules/fix_dst.sh | 2 +- lgsm/modules/fix_hw.sh | 2 +- lgsm/modules/fix_ins.sh | 2 +- lgsm/modules/fix_kf.sh | 2 +- lgsm/modules/fix_kf2.sh | 2 +- lgsm/modules/fix_mcb.sh | 2 +- lgsm/modules/fix_mta.sh | 2 +- lgsm/modules/fix_nmrih.sh | 2 +- lgsm/modules/fix_onset.sh | 2 +- lgsm/modules/fix_pvr.sh | 2 +- lgsm/modules/fix_ro.sh | 2 +- lgsm/modules/fix_rust.sh | 2 +- lgsm/modules/fix_rw.sh | 2 +- lgsm/modules/fix_samp.sh | 2 +- lgsm/modules/fix_sdtd.sh | 2 +- lgsm/modules/fix_sfc.sh | 2 +- lgsm/modules/fix_sm.sh | 2 +- lgsm/modules/fix_sof2.sh | 2 +- lgsm/modules/fix_squad.sh | 2 +- lgsm/modules/fix_st.sh | 2 +- lgsm/modules/fix_steamcmd.sh | 2 +- lgsm/modules/fix_terraria.sh | 2 +- lgsm/modules/fix_tf2.sh | 2 +- lgsm/modules/fix_ts3.sh | 2 +- lgsm/modules/fix_unt.sh | 2 +- lgsm/modules/fix_ut.sh | 2 +- lgsm/modules/fix_ut2k4.sh | 2 +- lgsm/modules/fix_ut3.sh | 2 +- lgsm/modules/fix_wurm.sh | 2 +- lgsm/modules/fix_xnt.sh | 2 +- lgsm/modules/fix_zmr.sh | 2 +- lgsm/modules/info_distro.sh | 6 +++--- lgsm/modules/info_game.sh | 2 +- lgsm/modules/info_messages.sh | 2 +- lgsm/modules/info_stats.sh | 2 +- lgsm/modules/install_complete.sh | 2 +- lgsm/modules/install_config.sh | 2 +- lgsm/modules/install_dst_token.sh | 2 +- lgsm/modules/install_eula.sh | 2 +- lgsm/modules/install_factorio_save.sh | 2 +- lgsm/modules/install_gslt.sh | 2 +- lgsm/modules/install_header.sh | 2 +- lgsm/modules/install_logs.sh | 2 +- lgsm/modules/install_mta_resources.sh | 2 +- lgsm/modules/install_retry.sh | 2 +- lgsm/modules/install_server_dir.sh | 2 +- lgsm/modules/install_server_files.sh | 2 +- lgsm/modules/install_squad_license.sh | 2 +- lgsm/modules/install_stats.sh | 2 +- lgsm/modules/install_steamcmd.sh | 2 +- lgsm/modules/install_ts3db.sh | 2 +- lgsm/modules/install_ut2k4_key.sh | 2 +- lgsm/modules/mods_core.sh | 2 +- lgsm/modules/mods_list.sh | 2 +- lgsm/modules/query_gamedig.sh | 2 +- lgsm/modules/query_gsquery.py | 2 +- lgsm/modules/update_fctr.sh | 2 +- lgsm/modules/update_jk2.sh | 2 +- lgsm/modules/update_mc.sh | 2 +- lgsm/modules/update_mcb.sh | 2 +- lgsm/modules/update_mta.sh | 2 +- lgsm/modules/update_pmc.sh | 2 +- lgsm/modules/update_steamcmd.sh | 2 +- lgsm/modules/update_ts3.sh | 2 +- lgsm/modules/update_ut99.sh | 2 +- lgsm/modules/update_vints.sh | 2 +- lgsm/modules/update_xnt.sh | 2 +- 148 files changed, 159 insertions(+), 159 deletions(-) diff --git a/lgsm/modules/alert.sh b/lgsm/modules/alert.sh index 40288d234..f2698e3b7 100644 --- a/lgsm/modules/alert.sh +++ b/lgsm/modules/alert.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM alert.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Overall module for managing alerts. diff --git a/lgsm/modules/alert_discord.sh b/lgsm/modules/alert_discord.sh index c98bef765..a447c498a 100644 --- a/lgsm/modules/alert_discord.sh +++ b/lgsm/modules/alert_discord.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM alert_discord.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Sends Discord alert. diff --git a/lgsm/modules/alert_email.sh b/lgsm/modules/alert_email.sh index 6833d9670..ca9db1bc4 100644 --- a/lgsm/modules/alert_email.sh +++ b/lgsm/modules/alert_email.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM alert_email.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Sends email alert. diff --git a/lgsm/modules/alert_gotify.sh b/lgsm/modules/alert_gotify.sh index 8f1d31e91..724ff1d79 100644 --- a/lgsm/modules/alert_gotify.sh +++ b/lgsm/modules/alert_gotify.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM alert_gotify.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Sends Gotify alert. diff --git a/lgsm/modules/alert_ifttt.sh b/lgsm/modules/alert_ifttt.sh index cbd740ec5..ca1c005d0 100644 --- a/lgsm/modules/alert_ifttt.sh +++ b/lgsm/modules/alert_ifttt.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM alert_ifttt.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Sends IFTTT alert. diff --git a/lgsm/modules/alert_pushbullet.sh b/lgsm/modules/alert_pushbullet.sh index 5ed3853f6..4b96a1f9f 100644 --- a/lgsm/modules/alert_pushbullet.sh +++ b/lgsm/modules/alert_pushbullet.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM alert_pushbullet.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Sends Pushbullet Messenger alert. diff --git a/lgsm/modules/alert_pushover.sh b/lgsm/modules/alert_pushover.sh index 22180d503..dc488026a 100644 --- a/lgsm/modules/alert_pushover.sh +++ b/lgsm/modules/alert_pushover.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM alert_pushover.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Sends Pushover alert. diff --git a/lgsm/modules/alert_rocketchat.sh b/lgsm/modules/alert_rocketchat.sh index 910722804..bff2c6a0b 100644 --- a/lgsm/modules/alert_rocketchat.sh +++ b/lgsm/modules/alert_rocketchat.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM alert_rocketchat.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Sends Rocketchat alert. diff --git a/lgsm/modules/alert_slack.sh b/lgsm/modules/alert_slack.sh index b74f98dec..58dc54772 100644 --- a/lgsm/modules/alert_slack.sh +++ b/lgsm/modules/alert_slack.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM alert_slack.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Sends Slack alert. diff --git a/lgsm/modules/alert_telegram.sh b/lgsm/modules/alert_telegram.sh index 98e1a980b..2e719dba7 100644 --- a/lgsm/modules/alert_telegram.sh +++ b/lgsm/modules/alert_telegram.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM alert_telegram.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Sends Telegram Messenger alert. diff --git a/lgsm/modules/check.sh b/lgsm/modules/check.sh index 2a63df3f3..7601898a9 100644 --- a/lgsm/modules/check.sh +++ b/lgsm/modules/check.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM check.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Overall module for managing checks. # Runs checks that will either halt on or fix an issue. diff --git a/lgsm/modules/check_config.sh b/lgsm/modules/check_config.sh index d8bfb5008..24bc1c37f 100644 --- a/lgsm/modules/check_config.sh +++ b/lgsm/modules/check_config.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM check_config.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Checks if the server config is missing and warns the user if needed. diff --git a/lgsm/modules/check_deps.sh b/lgsm/modules/check_deps.sh index df5cb9478..35145a11d 100644 --- a/lgsm/modules/check_deps.sh +++ b/lgsm/modules/check_deps.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM check_deps.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Checks and installs missing dependencies. diff --git a/lgsm/modules/check_executable.sh b/lgsm/modules/check_executable.sh index e7214ac33..5959c61aa 100644 --- a/lgsm/modules/check_executable.sh +++ b/lgsm/modules/check_executable.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM check_executable.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Checks if server executable exists. diff --git a/lgsm/modules/check_gamedig.sh b/lgsm/modules/check_gamedig.sh index 61149d567..b1913cf87 100644 --- a/lgsm/modules/check_gamedig.sh +++ b/lgsm/modules/check_gamedig.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM check_gamedig.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Installs nodejs and gamedig diff --git a/lgsm/modules/check_glibc.sh b/lgsm/modules/check_glibc.sh index 9da491bce..8b3d00658 100644 --- a/lgsm/modules/check_glibc.sh +++ b/lgsm/modules/check_glibc.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM check_glibc.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Checks if the server has the correct Glibc version. diff --git a/lgsm/modules/check_ip.sh b/lgsm/modules/check_ip.sh index bf0418f74..8f943c568 100644 --- a/lgsm/modules/check_ip.sh +++ b/lgsm/modules/check_ip.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM check_ip.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Automatically identifies the server interface IP. # If multiple interfaces are detected the user will need to manually set using ip="0.0.0.0". diff --git a/lgsm/modules/check_last_update.sh b/lgsm/modules/check_last_update.sh index 166d80a17..2686c6507 100644 --- a/lgsm/modules/check_last_update.sh +++ b/lgsm/modules/check_last_update.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM check_last_update.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Checks Lockfile to see when last update happened. # Will reboot server if instance not rebooted since update. diff --git a/lgsm/modules/check_logs.sh b/lgsm/modules/check_logs.sh index 036eea5e4..5e2d66c35 100644 --- a/lgsm/modules/check_logs.sh +++ b/lgsm/modules/check_logs.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM check_logs.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Checks if log files exist. diff --git a/lgsm/modules/check_permissions.sh b/lgsm/modules/check_permissions.sh index 44c527bfb..9ed1bb65e 100644 --- a/lgsm/modules/check_permissions.sh +++ b/lgsm/modules/check_permissions.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM check_permissions.sh # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Checks ownership & permissions of scripts, files and directories. diff --git a/lgsm/modules/check_root.sh b/lgsm/modules/check_root.sh index 8fe20764c..47825ddc9 100644 --- a/lgsm/modules/check_root.sh +++ b/lgsm/modules/check_root.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM check_root.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Checks if the user tried to run the script as root. diff --git a/lgsm/modules/check_status.sh b/lgsm/modules/check_status.sh index 906675e81..e017b89ec 100644 --- a/lgsm/modules/check_status.sh +++ b/lgsm/modules/check_status.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM check_status.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Checks the process status of the server. Either online or offline. diff --git a/lgsm/modules/check_steamcmd.sh b/lgsm/modules/check_steamcmd.sh index 5d14bb21f..0e7f5ce6c 100644 --- a/lgsm/modules/check_steamcmd.sh +++ b/lgsm/modules/check_steamcmd.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM check_steamcmd.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Checks if SteamCMD is installed correctly. diff --git a/lgsm/modules/check_system_dir.sh b/lgsm/modules/check_system_dir.sh index 2f57511fb..2b646835d 100644 --- a/lgsm/modules/check_system_dir.sh +++ b/lgsm/modules/check_system_dir.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM check_system_dir.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Checks if systemdir/serverfiles is accessible. diff --git a/lgsm/modules/check_system_requirements.sh b/lgsm/modules/check_system_requirements.sh index d25954427..a7314a0d8 100644 --- a/lgsm/modules/check_system_requirements.sh +++ b/lgsm/modules/check_system_requirements.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM check_system_requirements.sh # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Checks RAM requirements. diff --git a/lgsm/modules/check_tmuxception.sh b/lgsm/modules/check_tmuxception.sh index 8f1f94c73..fa0748c8b 100644 --- a/lgsm/modules/check_tmuxception.sh +++ b/lgsm/modules/check_tmuxception.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM check_config.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Checks if run from tmux or screen. diff --git a/lgsm/modules/check_version.sh b/lgsm/modules/check_version.sh index 5369fd832..b1e7f5584 100644 --- a/lgsm/modules/check_version.sh +++ b/lgsm/modules/check_version.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_version.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Will run update-lgsm if gameserver.sh and modules version does not match # this will allow gameserver.sh to update - useful for multi instance servers. diff --git a/lgsm/modules/command_backup.sh b/lgsm/modules/command_backup.sh index a3e1bbe7f..6bbc07f02 100644 --- a/lgsm/modules/command_backup.sh +++ b/lgsm/modules/command_backup.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_backup.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Creates a .tar.gz file in the backup directory. diff --git a/lgsm/modules/command_check_update.sh b/lgsm/modules/command_check_update.sh index 2e6855f7c..ee4c8ccb3 100644 --- a/lgsm/modules/command_check_update.sh +++ b/lgsm/modules/command_check_update.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_check_update.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Handles updating of servers. diff --git a/lgsm/modules/command_console.sh b/lgsm/modules/command_console.sh index a5d49d7f2..aa17e839e 100644 --- a/lgsm/modules/command_console.sh +++ b/lgsm/modules/command_console.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_console.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Gives access to the server tmux console. diff --git a/lgsm/modules/command_debug.sh b/lgsm/modules/command_debug.sh index 2e6c0e2e2..b5f2dabac 100644 --- a/lgsm/modules/command_debug.sh +++ b/lgsm/modules/command_debug.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_debug.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Runs the server without tmux and directly from the terminal. diff --git a/lgsm/modules/command_details.sh b/lgsm/modules/command_details.sh index ad55b1241..2800e5123 100644 --- a/lgsm/modules/command_details.sh +++ b/lgsm/modules/command_details.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_details.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Displays server information. diff --git a/lgsm/modules/command_dev_clear_modules.sh b/lgsm/modules/command_dev_clear_modules.sh index bf19b2578..e2e80164f 100644 --- a/lgsm/modules/command_dev_clear_modules.sh +++ b/lgsm/modules/command_dev_clear_modules.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_dev_clear_modules.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Deletes the contents of the modules dir. diff --git a/lgsm/modules/command_dev_debug.sh b/lgsm/modules/command_dev_debug.sh index eb0356985..3226fc186 100644 --- a/lgsm/modules/command_dev_debug.sh +++ b/lgsm/modules/command_dev_debug.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_dev_debug.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Dev only: Enables debugging log to be saved to dev-debug.log. diff --git a/lgsm/modules/command_dev_detect_deps.sh b/lgsm/modules/command_dev_detect_deps.sh index 6215fb897..fead2c285 100644 --- a/lgsm/modules/command_dev_detect_deps.sh +++ b/lgsm/modules/command_dev_detect_deps.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_dev_detect_deps.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Detects dependencies the server binary requires. diff --git a/lgsm/modules/command_dev_detect_glibc.sh b/lgsm/modules/command_dev_detect_glibc.sh index 214adc88e..6326cf5cb 100644 --- a/lgsm/modules/command_dev_detect_glibc.sh +++ b/lgsm/modules/command_dev_detect_glibc.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_dev_detect_glibc.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Automatically detects the version of GLIBC that is required. # Can check a file or directory recursively. diff --git a/lgsm/modules/command_dev_detect_ldd.sh b/lgsm/modules/command_dev_detect_ldd.sh index af41bb522..9d0bf5148 100644 --- a/lgsm/modules/command_dev_detect_ldd.sh +++ b/lgsm/modules/command_dev_detect_ldd.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_dev_detect_ldd.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Automatically detects required deps using ldd. # Can check a file or directory recursively. diff --git a/lgsm/modules/command_dev_parse_distro_details.sh b/lgsm/modules/command_dev_parse_distro_details.sh index ca2bfd9ed..f80c909ad 100644 --- a/lgsm/modules/command_dev_parse_distro_details.sh +++ b/lgsm/modules/command_dev_parse_distro_details.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_dev_parse_distro_details.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Display parsed distro details. @@ -87,7 +87,7 @@ missing_details="" # Loop through the distro details and store them. for key in "${!server_details[@]}"; do - value=${server_details[$key]} + value=${server_details[$key]} if [ -n "$value" ]; then available_details+="${lightblue}${key}: ${default}${value}\n" else @@ -97,18 +97,18 @@ done # Sort and output the available distro details. if [ -n "$available_details" ]; then - echo -e "" - echo -e "${bold}${lightgreen}Available Distro Details${default}" - fn_messages_separator - echo -e "${available_details}" | sort + echo -e "" + echo -e "${bold}${lightgreen}Available Distro Details${default}" + fn_messages_separator + echo -e "${available_details}" | sort fi # Sort and output the missing distro details. if [ -n "$missing_details" ]; then - echo -e "" - echo -e "${lightgreen}Missing or unsupported Distro Details${default}" - fn_messages_separator - echo -e "${missing_details}" | sort + echo -e "" + echo -e "${lightgreen}Missing or unsupported Distro Details${default}" + fn_messages_separator + echo -e "${missing_details}" | sort fi core_exit.sh diff --git a/lgsm/modules/command_dev_parse_game_details.sh b/lgsm/modules/command_dev_parse_game_details.sh index 5938f817d..87284904c 100644 --- a/lgsm/modules/command_dev_parse_game_details.sh +++ b/lgsm/modules/command_dev_parse_game_details.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_dev_parse_game_details.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Display parsed gameserver details. diff --git a/lgsm/modules/command_dev_query_raw.sh b/lgsm/modules/command_dev_query_raw.sh index 39f4787d3..345298941 100644 --- a/lgsm/modules/command_dev_query_raw.sh +++ b/lgsm/modules/command_dev_query_raw.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_dev_query_raw.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Raw gamedig output of the server. diff --git a/lgsm/modules/command_fastdl.sh b/lgsm/modules/command_fastdl.sh index c1c667797..4e9378945 100644 --- a/lgsm/modules/command_fastdl.sh +++ b/lgsm/modules/command_fastdl.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_fastdl.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Creates a FastDL directory. diff --git a/lgsm/modules/command_install.sh b/lgsm/modules/command_install.sh index c3bf27c61..8dc9a77df 100644 --- a/lgsm/modules/command_install.sh +++ b/lgsm/modules/command_install.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_install.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Overall module for the installer. diff --git a/lgsm/modules/command_install_resources_mta.sh b/lgsm/modules/command_install_resources_mta.sh index 31a9165fd..aecda1452 100644 --- a/lgsm/modules/command_install_resources_mta.sh +++ b/lgsm/modules/command_install_resources_mta.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_install_resources_mta.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Installs the default resources for Multi Theft Auto. diff --git a/lgsm/modules/command_mods_install.sh b/lgsm/modules/command_mods_install.sh index 19de72ab0..d1b3fb67a 100644 --- a/lgsm/modules/command_mods_install.sh +++ b/lgsm/modules/command_mods_install.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_mods_install.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: List and installs available mods along with mods_list.sh and mods_core.sh. diff --git a/lgsm/modules/command_mods_remove.sh b/lgsm/modules/command_mods_remove.sh index 5f70ac389..412e07546 100644 --- a/lgsm/modules/command_mods_remove.sh +++ b/lgsm/modules/command_mods_remove.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_mods_uninstall.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Uninstall mods along with mods_list.sh and mods_core.sh. diff --git a/lgsm/modules/command_mods_update.sh b/lgsm/modules/command_mods_update.sh index cd5c3b03f..ca81dd947 100644 --- a/lgsm/modules/command_mods_update.sh +++ b/lgsm/modules/command_mods_update.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_mods_update.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Updates installed mods along with mods_list.sh and mods_core.sh. diff --git a/lgsm/modules/command_monitor.sh b/lgsm/modules/command_monitor.sh index e9baf71e5..a9691fb98 100644 --- a/lgsm/modules/command_monitor.sh +++ b/lgsm/modules/command_monitor.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_monitor.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Monitors server by checking for running processes # then passes to gamedig and gsquery. diff --git a/lgsm/modules/command_postdetails.sh b/lgsm/modules/command_postdetails.sh index 3bfed78ed..6626d51a7 100644 --- a/lgsm/modules/command_postdetails.sh +++ b/lgsm/modules/command_postdetails.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_postdetails.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Strips sensitive information out of Details output. diff --git a/lgsm/modules/command_restart.sh b/lgsm/modules/command_restart.sh index 457d1d17f..0a7f9b5f0 100644 --- a/lgsm/modules/command_restart.sh +++ b/lgsm/modules/command_restart.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_restart.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Restarts the server. diff --git a/lgsm/modules/command_send.sh b/lgsm/modules/command_send.sh index cf6a9f08a..e31452707 100644 --- a/lgsm/modules/command_send.sh +++ b/lgsm/modules/command_send.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_send.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Send command to the server tmux console. diff --git a/lgsm/modules/command_skeleton.sh b/lgsm/modules/command_skeleton.sh index 48a6bd187..ca32610e9 100644 --- a/lgsm/modules/command_skeleton.sh +++ b/lgsm/modules/command_skeleton.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_skeleton.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Creates an copy of a game servers directorys. diff --git a/lgsm/modules/command_sponsor.sh b/lgsm/modules/command_sponsor.sh index ea49a3099..e7aeeda95 100755 --- a/lgsm/modules/command_sponsor.sh +++ b/lgsm/modules/command_sponsor.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_sponsor.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Shows ways to sponsor. diff --git a/lgsm/modules/command_start.sh b/lgsm/modules/command_start.sh index cca044518..c2be7ed2f 100644 --- a/lgsm/modules/command_start.sh +++ b/lgsm/modules/command_start.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_start.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Starts the server. diff --git a/lgsm/modules/command_stop.sh b/lgsm/modules/command_stop.sh index 7783cc94f..84f5998cd 100644 --- a/lgsm/modules/command_stop.sh +++ b/lgsm/modules/command_stop.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_stop.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Stops the server. diff --git a/lgsm/modules/command_test_alert.sh b/lgsm/modules/command_test_alert.sh index 15f481391..becb365a3 100644 --- a/lgsm/modules/command_test_alert.sh +++ b/lgsm/modules/command_test_alert.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_test_alert.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Sends a test alert. diff --git a/lgsm/modules/command_ts3_server_pass.sh b/lgsm/modules/command_ts3_server_pass.sh index 0223a877c..807d025b7 100644 --- a/lgsm/modules/command_ts3_server_pass.sh +++ b/lgsm/modules/command_ts3_server_pass.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_ts3_server_pass.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Changes TS3 serveradmin password. diff --git a/lgsm/modules/command_update.sh b/lgsm/modules/command_update.sh index a579cfe8e..6bb30a4c8 100644 --- a/lgsm/modules/command_update.sh +++ b/lgsm/modules/command_update.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_update.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Handles updating of servers. diff --git a/lgsm/modules/command_update_linuxgsm.sh b/lgsm/modules/command_update_linuxgsm.sh index 4358b626c..e6e5e711d 100644 --- a/lgsm/modules/command_update_linuxgsm.sh +++ b/lgsm/modules/command_update_linuxgsm.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_update_linuxgsm.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Deletes the modules dir to allow re-downloading of modules from GitHub. diff --git a/lgsm/modules/command_validate.sh b/lgsm/modules/command_validate.sh index d3511d7bb..e35749924 100644 --- a/lgsm/modules/command_validate.sh +++ b/lgsm/modules/command_validate.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_validate.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Runs a server validation. diff --git a/lgsm/modules/command_wipe.sh b/lgsm/modules/command_wipe.sh index 378dae0ec..daf9270e6 100644 --- a/lgsm/modules/command_wipe.sh +++ b/lgsm/modules/command_wipe.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_backup.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Wipes server data, useful after updates for some games like Rust. diff --git a/lgsm/modules/compress_unreal2_maps.sh b/lgsm/modules/compress_unreal2_maps.sh index f67ac7010..4469aca40 100644 --- a/lgsm/modules/compress_unreal2_maps.sh +++ b/lgsm/modules/compress_unreal2_maps.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM compress_unreal2_maps.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Compresses unreal maps. diff --git a/lgsm/modules/compress_ut99_maps.sh b/lgsm/modules/compress_ut99_maps.sh index 51bbd386a..23a93b3b7 100644 --- a/lgsm/modules/compress_ut99_maps.sh +++ b/lgsm/modules/compress_ut99_maps.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM compress_ut99_maps.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Compresses unreal maps. diff --git a/lgsm/modules/core_dl.sh b/lgsm/modules/core_dl.sh index 908c90f38..dde24d9da 100644 --- a/lgsm/modules/core_dl.sh +++ b/lgsm/modules/core_dl.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM core_dl.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Deals with all downloads for LinuxGSM. diff --git a/lgsm/modules/core_exit.sh b/lgsm/modules/core_exit.sh index 989a4c543..fd7645462 100644 --- a/lgsm/modules/core_exit.sh +++ b/lgsm/modules/core_exit.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM core_exit.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Handles exiting of LinuxGSM by running and reporting an exit code. diff --git a/lgsm/modules/core_getopt.sh b/lgsm/modules/core_getopt.sh index cd3e57cb5..688dcdc9c 100644 --- a/lgsm/modules/core_getopt.sh +++ b/lgsm/modules/core_getopt.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM core_getopt.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: getopt arguments. diff --git a/lgsm/modules/core_github.sh b/lgsm/modules/core_github.sh index 402ee078c..3b3a96c0f 100644 --- a/lgsm/modules/core_github.sh +++ b/lgsm/modules/core_github.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM core_github.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: core module file for updates via github diff --git a/lgsm/modules/core_legacy.sh b/lgsm/modules/core_legacy.sh index cf11e3a54..4c9a55c39 100644 --- a/lgsm/modules/core_legacy.sh +++ b/lgsm/modules/core_legacy.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM core_legacy.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Code for backwards compatability with older versions of LinuxGSM. diff --git a/lgsm/modules/core_logs.sh b/lgsm/modules/core_logs.sh index 3166041ae..7b435b563 100644 --- a/lgsm/modules/core_logs.sh +++ b/lgsm/modules/core_logs.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM core_logs.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Acts as a log rotator, removing old logs. diff --git a/lgsm/modules/core_messages.sh b/lgsm/modules/core_messages.sh index 52129dc4b..80ef293d8 100644 --- a/lgsm/modules/core_messages.sh +++ b/lgsm/modules/core_messages.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM core_messages.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Defines on-screen messages such as [ OK ] and how script logs look. diff --git a/lgsm/modules/core_modules.sh b/lgsm/modules/core_modules.sh index abd9fe423..7726559cc 100644 --- a/lgsm/modules/core_modules.sh +++ b/lgsm/modules/core_modules.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM core_modules.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Defines all modules to allow download and execution of modules using fn_fetch_module. # This module is called first before any other module. Without this file other modules will not load. diff --git a/lgsm/modules/core_steamcmd.sh b/lgsm/modules/core_steamcmd.sh index 326fecf70..552ff1905 100644 --- a/lgsm/modules/core_steamcmd.sh +++ b/lgsm/modules/core_steamcmd.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM core_steamcmd.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Core modules for SteamCMD diff --git a/lgsm/modules/core_trap.sh b/lgsm/modules/core_trap.sh index ea6fce869..4b66b3937 100644 --- a/lgsm/modules/core_trap.sh +++ b/lgsm/modules/core_trap.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM core_trap.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Handles CTRL-C trap to give an exit code. diff --git a/lgsm/modules/fix.sh b/lgsm/modules/fix.sh index 6335659f1..f9628a335 100644 --- a/lgsm/modules/fix.sh +++ b/lgsm/modules/fix.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Overall module for managing fixes. # Runs modules that will fix an issue. diff --git a/lgsm/modules/fix_ark.sh b/lgsm/modules/fix_ark.sh index 03e53380f..366d137dd 100644 --- a/lgsm/modules/fix_ark.sh +++ b/lgsm/modules/fix_ark.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_ark.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with ARK: Survival Evolved. diff --git a/lgsm/modules/fix_arma3.sh b/lgsm/modules/fix_arma3.sh index b415b81d6..66f5ebe5d 100644 --- a/lgsm/modules/fix_arma3.sh +++ b/lgsm/modules/fix_arma3.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_arma3.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with ARMA3. diff --git a/lgsm/modules/fix_armar.sh b/lgsm/modules/fix_armar.sh index ae2c08f33..c2bb8fbdb 100755 --- a/lgsm/modules/fix_armar.sh +++ b/lgsm/modules/fix_armar.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_armar.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Arma Reforger. diff --git a/lgsm/modules/fix_av.sh b/lgsm/modules/fix_av.sh index bfff59af6..ea225810c 100644 --- a/lgsm/modules/fix_av.sh +++ b/lgsm/modules/fix_av.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_av.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Avorion. diff --git a/lgsm/modules/fix_bo.sh b/lgsm/modules/fix_bo.sh index 24e76874e..5d74f27de 100644 --- a/lgsm/modules/fix_bo.sh +++ b/lgsm/modules/fix_bo.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_hw.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Ballistic Overkill. diff --git a/lgsm/modules/fix_bt.sh b/lgsm/modules/fix_bt.sh index 4d837a1ba..51fc3d505 100755 --- a/lgsm/modules/fix_bt.sh +++ b/lgsm/modules/fix_bt.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_bt.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Barotrauma. diff --git a/lgsm/modules/fix_cmw.sh b/lgsm/modules/fix_cmw.sh index a57c6c8cb..413bfbc33 100644 --- a/lgsm/modules/fix_cmw.sh +++ b/lgsm/modules/fix_cmw.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_cmw.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Chivalry: Medieval Warfare. diff --git a/lgsm/modules/fix_csgo.sh b/lgsm/modules/fix_csgo.sh index ea858ee3c..8f5550ab5 100644 --- a/lgsm/modules/fix_csgo.sh +++ b/lgsm/modules/fix_csgo.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_csgo.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Counter-Strike: Global Offensive. diff --git a/lgsm/modules/fix_dst.sh b/lgsm/modules/fix_dst.sh index ff963d342..2848fa5bb 100644 --- a/lgsm/modules/fix_dst.sh +++ b/lgsm/modules/fix_dst.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_dst.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Don't Starve Together. diff --git a/lgsm/modules/fix_hw.sh b/lgsm/modules/fix_hw.sh index 0e70b7195..c7d209bb6 100644 --- a/lgsm/modules/fix_hw.sh +++ b/lgsm/modules/fix_hw.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_hw.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Hurtworld. diff --git a/lgsm/modules/fix_ins.sh b/lgsm/modules/fix_ins.sh index cc79e3685..1d1423c6b 100644 --- a/lgsm/modules/fix_ins.sh +++ b/lgsm/modules/fix_ins.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_ins.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Insurgency. diff --git a/lgsm/modules/fix_kf.sh b/lgsm/modules/fix_kf.sh index e38b5883a..00b99e06c 100644 --- a/lgsm/modules/fix_kf.sh +++ b/lgsm/modules/fix_kf.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_kf.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Killing Floor. diff --git a/lgsm/modules/fix_kf2.sh b/lgsm/modules/fix_kf2.sh index cb4707414..495e9d70e 100644 --- a/lgsm/modules/fix_kf2.sh +++ b/lgsm/modules/fix_kf2.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_kf2.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Killing Floor 2. diff --git a/lgsm/modules/fix_mcb.sh b/lgsm/modules/fix_mcb.sh index 1e95bb4a8..bc84d84e1 100644 --- a/lgsm/modules/fix_mcb.sh +++ b/lgsm/modules/fix_mcb.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_mcb.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves various issues with Minecraft Bedrock. diff --git a/lgsm/modules/fix_mta.sh b/lgsm/modules/fix_mta.sh index 4e533eb51..2fff69691 100644 --- a/lgsm/modules/fix_mta.sh +++ b/lgsm/modules/fix_mta.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_mta.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves various issues with Multi Theft Auto. diff --git a/lgsm/modules/fix_nmrih.sh b/lgsm/modules/fix_nmrih.sh index dfbb76d92..4eb76c24e 100644 --- a/lgsm/modules/fix_nmrih.sh +++ b/lgsm/modules/fix_nmrih.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_nmrih.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Create symlinks for renamed No More Room In Hell serverfiles. # Solution from Steam Community post: https://steamcommunity.com/app/224260/discussions/2/1732089092441769414/ diff --git a/lgsm/modules/fix_onset.sh b/lgsm/modules/fix_onset.sh index 7d644ef7b..6430e5d6b 100644 --- a/lgsm/modules/fix_onset.sh +++ b/lgsm/modules/fix_onset.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_onset.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves various issues with Onset. diff --git a/lgsm/modules/fix_pvr.sh b/lgsm/modules/fix_pvr.sh index 6d8727e33..e4409bc37 100644 --- a/lgsm/modules/fix_pvr.sh +++ b/lgsm/modules/fix_pvr.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_pvr.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves various issues with Pavlov VR. diff --git a/lgsm/modules/fix_ro.sh b/lgsm/modules/fix_ro.sh index 21663a9ea..8b9bee442 100644 --- a/lgsm/modules/fix_ro.sh +++ b/lgsm/modules/fix_ro.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_ro.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Red Orchestra: Ostfront 41-45. diff --git a/lgsm/modules/fix_rust.sh b/lgsm/modules/fix_rust.sh index 809b5b1df..af995a2fa 100644 --- a/lgsm/modules/fix_rust.sh +++ b/lgsm/modules/fix_rust.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_rust.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Rust. diff --git a/lgsm/modules/fix_rw.sh b/lgsm/modules/fix_rw.sh index 17acf4def..dee15dedb 100644 --- a/lgsm/modules/fix_rw.sh +++ b/lgsm/modules/fix_rw.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_rw.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Rising World. diff --git a/lgsm/modules/fix_samp.sh b/lgsm/modules/fix_samp.sh index 0b5d0ab22..e193485d7 100644 --- a/lgsm/modules/fix_samp.sh +++ b/lgsm/modules/fix_samp.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_sfc.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issue that the default rcon password is not changed. diff --git a/lgsm/modules/fix_sdtd.sh b/lgsm/modules/fix_sdtd.sh index 7988b0d67..2b4620687 100644 --- a/lgsm/modules/fix_sdtd.sh +++ b/lgsm/modules/fix_sdtd.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_sdtd.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with 7 Days to Die. diff --git a/lgsm/modules/fix_sfc.sh b/lgsm/modules/fix_sfc.sh index 308f74b24..70e5d0484 100644 --- a/lgsm/modules/fix_sfc.sh +++ b/lgsm/modules/fix_sfc.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_sfc.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Source Forts Classic. diff --git a/lgsm/modules/fix_sm.sh b/lgsm/modules/fix_sm.sh index 1d72a48bf..d75ca8c78 100644 --- a/lgsm/modules/fix_sm.sh +++ b/lgsm/modules/fix_sm.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_sm.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Unturned. diff --git a/lgsm/modules/fix_sof2.sh b/lgsm/modules/fix_sof2.sh index 4e5b13624..45e3b299c 100644 --- a/lgsm/modules/fix_sof2.sh +++ b/lgsm/modules/fix_sof2.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_rust.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Soldier of Fortune 2. diff --git a/lgsm/modules/fix_squad.sh b/lgsm/modules/fix_squad.sh index 2fec57f0e..b9ee76a8d 100644 --- a/lgsm/modules/fix_squad.sh +++ b/lgsm/modules/fix_squad.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_squad.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Squad. diff --git a/lgsm/modules/fix_st.sh b/lgsm/modules/fix_st.sh index 4d100c6fc..bbd9890bd 100644 --- a/lgsm/modules/fix_st.sh +++ b/lgsm/modules/fix_st.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_rust.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Stationeers. diff --git a/lgsm/modules/fix_steamcmd.sh b/lgsm/modules/fix_steamcmd.sh index 2a2076072..0ba5c85b2 100644 --- a/lgsm/modules/fix_steamcmd.sh +++ b/lgsm/modules/fix_steamcmd.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_steamcmd.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with SteamCMD. diff --git a/lgsm/modules/fix_terraria.sh b/lgsm/modules/fix_terraria.sh index dc734b6fd..0d45e257f 100644 --- a/lgsm/modules/fix_terraria.sh +++ b/lgsm/modules/fix_terraria.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_terraria.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Terraria. diff --git a/lgsm/modules/fix_tf2.sh b/lgsm/modules/fix_tf2.sh index fe7de8278..105026488 100644 --- a/lgsm/modules/fix_tf2.sh +++ b/lgsm/modules/fix_tf2.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_tf2.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Team Fortress 2. diff --git a/lgsm/modules/fix_ts3.sh b/lgsm/modules/fix_ts3.sh index 5c80aa15e..0f081cb37 100644 --- a/lgsm/modules/fix_ts3.sh +++ b/lgsm/modules/fix_ts3.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_ts3.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Teamspeak 3. diff --git a/lgsm/modules/fix_unt.sh b/lgsm/modules/fix_unt.sh index 9afdce337..dbe64ffd6 100644 --- a/lgsm/modules/fix_unt.sh +++ b/lgsm/modules/fix_unt.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_rust.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Unturned. diff --git a/lgsm/modules/fix_ut.sh b/lgsm/modules/fix_ut.sh index ded65ddad..3da5c068c 100644 --- a/lgsm/modules/fix_ut.sh +++ b/lgsm/modules/fix_ut.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_ut.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Unreal Tournament. diff --git a/lgsm/modules/fix_ut2k4.sh b/lgsm/modules/fix_ut2k4.sh index 5da1eee12..4b9d35011 100644 --- a/lgsm/modules/fix_ut2k4.sh +++ b/lgsm/modules/fix_ut2k4.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_ut2k4.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Unreal Tournament 2004. diff --git a/lgsm/modules/fix_ut3.sh b/lgsm/modules/fix_ut3.sh index 386833efc..aa5c5e464 100644 --- a/lgsm/modules/fix_ut3.sh +++ b/lgsm/modules/fix_ut3.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_ut2.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Unreal Tournament 3. diff --git a/lgsm/modules/fix_wurm.sh b/lgsm/modules/fix_wurm.sh index b6f5762f5..6f17ccd76 100644 --- a/lgsm/modules/fix_wurm.sh +++ b/lgsm/modules/fix_wurm.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_wurm.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Wurm Unlimited. diff --git a/lgsm/modules/fix_xnt.sh b/lgsm/modules/fix_xnt.sh index 218b99a66..44b51c5de 100644 --- a/lgsm/modules/fix_xnt.sh +++ b/lgsm/modules/fix_xnt.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_xnt.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Install Xonotic Default Config diff --git a/lgsm/modules/fix_zmr.sh b/lgsm/modules/fix_zmr.sh index a88d82f34..5b42eeccf 100644 --- a/lgsm/modules/fix_zmr.sh +++ b/lgsm/modules/fix_zmr.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM fix_sfc.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Resolves issues with Zombie Master: Reborn. diff --git a/lgsm/modules/info_distro.sh b/lgsm/modules/info_distro.sh index adcdb759b..0813554dc 100644 --- a/lgsm/modules/info_distro.sh +++ b/lgsm/modules/info_distro.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM info_distro.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Variables providing useful info on the Operating System such as disk and performace info. # Used for command_details.sh, command_debug.sh and alert.sh. @@ -29,8 +29,8 @@ kernel="$(uname -r)" # Kernel e.g. 2.6.32-042stab120.16 distro_info_array=(os-release lsb_release hostnamectl debian_version redhat-release) for distro_info in "${distro_info_array[@]}"; do if [ -f "/etc/os-release" ] && [ "${distro_info}" == "os-release" ]; then - distroname="$(grep "PRETTY_NAME" /etc/os-release | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. Ubuntu 22.04.3 LTS - distroversion="$(grep "VERSION_ID" /etc/os-release | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. 22.04 + distroname="$(grep "PRETTY_NAME" /etc/os-release | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. Ubuntu 22.04.3 LTS + distroversion="$(grep "VERSION_ID" /etc/os-release | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. 22.04 distroid="$(grep "ID=" /etc/os-release | grep -v _ID | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. ubuntu distroidlike="$(grep "ID_LIKE=" /etc/os-release | grep -v _ID | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. debian distrocodename="$(grep "VERSION_CODENAME" /etc/os-release | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. jammy diff --git a/lgsm/modules/info_game.sh b/lgsm/modules/info_game.sh index 8496f078f..a9d9834b0 100644 --- a/lgsm/modules/info_game.sh +++ b/lgsm/modules/info_game.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM info_game.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Gathers various game server information. # !Note: When adding variables to this script, ensure that they are also added to the command_dev_parse_game_details.sh script. diff --git a/lgsm/modules/info_messages.sh b/lgsm/modules/info_messages.sh index 7f40c8312..ff4b5d870 100644 --- a/lgsm/modules/info_messages.sh +++ b/lgsm/modules/info_messages.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM info_messages.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Defines server info messages for details and alerts. diff --git a/lgsm/modules/info_stats.sh b/lgsm/modules/info_stats.sh index dcc247b59..c8a96552a 100644 --- a/lgsm/modules/info_stats.sh +++ b/lgsm/modules/info_stats.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM info_stats.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Collect optional Stats sent to LinuxGSM project. # Uses Google analytics. diff --git a/lgsm/modules/install_complete.sh b/lgsm/modules/install_complete.sh index 5a9873067..0ee01954a 100644 --- a/lgsm/modules/install_complete.sh +++ b/lgsm/modules/install_complete.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_complete.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Prints installation completion message and hints. diff --git a/lgsm/modules/install_config.sh b/lgsm/modules/install_config.sh index 96ae70654..1517812c1 100644 --- a/lgsm/modules/install_config.sh +++ b/lgsm/modules/install_config.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_config.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Creates default server configs. diff --git a/lgsm/modules/install_dst_token.sh b/lgsm/modules/install_dst_token.sh index 89ec00a90..fd0b4727b 100644 --- a/lgsm/modules/install_dst_token.sh +++ b/lgsm/modules/install_dst_token.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_dst_token.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Configures Don't Starve Together cluster with given token. diff --git a/lgsm/modules/install_eula.sh b/lgsm/modules/install_eula.sh index 7f7f95f35..272ff205a 100644 --- a/lgsm/modules/install_eula.sh +++ b/lgsm/modules/install_eula.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_eula.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Gets user to accept the EULA. diff --git a/lgsm/modules/install_factorio_save.sh b/lgsm/modules/install_factorio_save.sh index 589a9d8ed..5dfb4758c 100644 --- a/lgsm/modules/install_factorio_save.sh +++ b/lgsm/modules/install_factorio_save.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_factorio_save.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Creates the initial save file for Factorio. diff --git a/lgsm/modules/install_gslt.sh b/lgsm/modules/install_gslt.sh index aa8d89d33..960b1e20c 100644 --- a/lgsm/modules/install_gslt.sh +++ b/lgsm/modules/install_gslt.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_gslt.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Configures GSLT. diff --git a/lgsm/modules/install_header.sh b/lgsm/modules/install_header.sh index a7f1f9ddb..8fad78d2c 100644 --- a/lgsm/modules/install_header.sh +++ b/lgsm/modules/install_header.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_header.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Prints installation header. diff --git a/lgsm/modules/install_logs.sh b/lgsm/modules/install_logs.sh index 294bc1e46..3e522a082 100644 --- a/lgsm/modules/install_logs.sh +++ b/lgsm/modules/install_logs.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_logs.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Creates log directories. diff --git a/lgsm/modules/install_mta_resources.sh b/lgsm/modules/install_mta_resources.sh index bafdbdbf1..f13c39abd 100644 --- a/lgsm/modules/install_mta_resources.sh +++ b/lgsm/modules/install_mta_resources.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_mta_resources.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Installs the libmysqlclient for database functions on the server and optionally installs default resources required to run the server. diff --git a/lgsm/modules/install_retry.sh b/lgsm/modules/install_retry.sh index 1fc4bf36a..71417a73f 100644 --- a/lgsm/modules/install_retry.sh +++ b/lgsm/modules/install_retry.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_retry.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Asks for installation retry after failure. diff --git a/lgsm/modules/install_server_dir.sh b/lgsm/modules/install_server_dir.sh index 0703e0c54..2922f397a 100644 --- a/lgsm/modules/install_server_dir.sh +++ b/lgsm/modules/install_server_dir.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_server_dir.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Creates the server directory. diff --git a/lgsm/modules/install_server_files.sh b/lgsm/modules/install_server_files.sh index 7d773ce9f..33043d8b6 100644 --- a/lgsm/modules/install_server_files.sh +++ b/lgsm/modules/install_server_files.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_server_files.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Installs server files. diff --git a/lgsm/modules/install_squad_license.sh b/lgsm/modules/install_squad_license.sh index 28f4456a5..0bb71c4a8 100644 --- a/lgsm/modules/install_squad_license.sh +++ b/lgsm/modules/install_squad_license.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_squad_license.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Configures the Squad server's license. diff --git a/lgsm/modules/install_stats.sh b/lgsm/modules/install_stats.sh index 40a13434d..fa43c280f 100644 --- a/lgsm/modules/install_stats.sh +++ b/lgsm/modules/install_stats.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_stats.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Enabled LinuxGSM Stats. diff --git a/lgsm/modules/install_steamcmd.sh b/lgsm/modules/install_steamcmd.sh index 50599ebd5..475544a6a 100644 --- a/lgsm/modules/install_steamcmd.sh +++ b/lgsm/modules/install_steamcmd.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_steamcmd.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Downloads SteamCMD on install. diff --git a/lgsm/modules/install_ts3db.sh b/lgsm/modules/install_ts3db.sh index 464bd686a..c8f90a9cf 100644 --- a/lgsm/modules/install_ts3db.sh +++ b/lgsm/modules/install_ts3db.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_ts3db.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Installs the database server MariaDB for TeamSpeak 3. diff --git a/lgsm/modules/install_ut2k4_key.sh b/lgsm/modules/install_ut2k4_key.sh index 6fbd2a838..7ffbba20c 100644 --- a/lgsm/modules/install_ut2k4_key.sh +++ b/lgsm/modules/install_ut2k4_key.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM install_ut2k4_key.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Activates ut2k4 server with given key. diff --git a/lgsm/modules/mods_core.sh b/lgsm/modules/mods_core.sh index 1b85a95b3..aa24d903f 100644 --- a/lgsm/modules/mods_core.sh +++ b/lgsm/modules/mods_core.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_mods_install.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Core modules for mods list/install/update/remove diff --git a/lgsm/modules/mods_list.sh b/lgsm/modules/mods_list.sh index ca320e468..d6622d1b2 100644 --- a/lgsm/modules/mods_list.sh +++ b/lgsm/modules/mods_list.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM mods_list.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Lists and defines available mods for LinuxGSM supported servers; works along with mods_core.sh. # Usage: To add a mod, you need to add an array variable following the guide to set proper values; diff --git a/lgsm/modules/query_gamedig.sh b/lgsm/modules/query_gamedig.sh index efac18d45..f370fae97 100644 --- a/lgsm/modules/query_gamedig.sh +++ b/lgsm/modules/query_gamedig.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM query_gamedig.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Querys a gameserver using node-gamedig. # https://github.com/gamedig/node-gamedig diff --git a/lgsm/modules/query_gsquery.py b/lgsm/modules/query_gsquery.py index 788789f0a..ecdf8165c 100644 --- a/lgsm/modules/query_gsquery.py +++ b/lgsm/modules/query_gsquery.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # LinuxGSM query_gsquery.py module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Allows querying of various game servers. diff --git a/lgsm/modules/update_fctr.sh b/lgsm/modules/update_fctr.sh index 8fb78ede3..b64812319 100644 --- a/lgsm/modules/update_fctr.sh +++ b/lgsm/modules/update_fctr.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM update_fctr.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Handles updating of Factorio servers. diff --git a/lgsm/modules/update_jk2.sh b/lgsm/modules/update_jk2.sh index e2715c01c..ed4886a48 100644 --- a/lgsm/modules/update_jk2.sh +++ b/lgsm/modules/update_jk2.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM update_jk2.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Handles updating of Jedi Knight 2 servers. diff --git a/lgsm/modules/update_mc.sh b/lgsm/modules/update_mc.sh index 40038ddeb..6ece44da4 100644 --- a/lgsm/modules/update_mc.sh +++ b/lgsm/modules/update_mc.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM update_mc.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Handles updating of Minecraft: Java Edition servers. diff --git a/lgsm/modules/update_mcb.sh b/lgsm/modules/update_mcb.sh index 7bd273d66..55b3586fd 100644 --- a/lgsm/modules/update_mcb.sh +++ b/lgsm/modules/update_mcb.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM update_mcb.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Handles updating of Minecraft Bedrock servers. diff --git a/lgsm/modules/update_mta.sh b/lgsm/modules/update_mta.sh index c6f7dfcb0..b93dc9af1 100644 --- a/lgsm/modules/update_mta.sh +++ b/lgsm/modules/update_mta.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM update_mta.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Handles updating of Multi Theft Auto servers. diff --git a/lgsm/modules/update_pmc.sh b/lgsm/modules/update_pmc.sh index 5d44bee21..b3c7d0dc2 100644 --- a/lgsm/modules/update_pmc.sh +++ b/lgsm/modules/update_pmc.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM update_pmc.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Handles updating of PaperMC and Waterfall servers. diff --git a/lgsm/modules/update_steamcmd.sh b/lgsm/modules/update_steamcmd.sh index 20a85ab93..ccc8d6b36 100644 --- a/lgsm/modules/update_steamcmd.sh +++ b/lgsm/modules/update_steamcmd.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM update_steamcmd.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Handles updating using SteamCMD. diff --git a/lgsm/modules/update_ts3.sh b/lgsm/modules/update_ts3.sh index 1fa77f428..30ddf2801 100644 --- a/lgsm/modules/update_ts3.sh +++ b/lgsm/modules/update_ts3.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_ts3.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Handles updating of Teamspeak 3 servers. diff --git a/lgsm/modules/update_ut99.sh b/lgsm/modules/update_ut99.sh index 6d0be1941..cb74ec3b7 100644 --- a/lgsm/modules/update_ut99.sh +++ b/lgsm/modules/update_ut99.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_ut99.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Handles updating of Unreal Tournament 99 servers. diff --git a/lgsm/modules/update_vints.sh b/lgsm/modules/update_vints.sh index 403917e0c..2f7f857a1 100644 --- a/lgsm/modules/update_vints.sh +++ b/lgsm/modules/update_vints.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM update_vints.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Handles updating of Vintage Story servers. diff --git a/lgsm/modules/update_xnt.sh b/lgsm/modules/update_xnt.sh index d935e3989..f2cdbe324 100644 --- a/lgsm/modules/update_xnt.sh +++ b/lgsm/modules/update_xnt.sh @@ -1,7 +1,7 @@ #!/bin/bash # LinuxGSM command_ut99.sh module # Author: Daniel Gibbs -# Contributors: http://linuxgsm.com/contrib +# Contributors: https://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Handles updating of Unreal Tournament 99 servers. From 4446e79d78b655d79db4d9d0333753af391d00b3 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Sep 2024 21:58:44 +0100 Subject: [PATCH 06/17] feat(ut3): Update the UT3 archive to have OpenSpy fix (#4657) --- lgsm/config-default/config-lgsm/ut3server/_default.cfg | 4 ++-- lgsm/modules/install_server_files.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lgsm/config-default/config-lgsm/ut3server/_default.cfg b/lgsm/config-default/config-lgsm/ut3server/_default.cfg index 1088d1f0c..22817e40c 100644 --- a/lgsm/config-default/config-lgsm/ut3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut3server/_default.cfg @@ -22,8 +22,8 @@ usesstats="false" shouldadvertise="true" pureserver="1" allowjoininprogress="true" -# Required: GameSpy Username and password -# https://docs.linuxgsm.com/game-servers/unreal-tournament-3#server-gamespy-login +# Required: OpenSpy Username and password +# https://docs.linuxgsm.com/game-servers/unreal-tournament-3#server-openspy-login gsusername="" gspassword="" diff --git a/lgsm/modules/install_server_files.sh b/lgsm/modules/install_server_files.sh index 33043d8b6..baa18aef7 100644 --- a/lgsm/modules/install_server_files.sh +++ b/lgsm/modules/install_server_files.sh @@ -193,13 +193,13 @@ fn_install_server_files() { force="noforce" md5="41dd92015713a78211eaccf503b72393" elif [ "${shortname}" == "ut3" ]; then - remote_fileurl="http://linuxgsm.download/UnrealTournament3/UT3-linux-server-2.1.tar.xz" + remote_fileurl="http://linuxgsm.download/UnrealTournament3/UT3-linux-server-2.1-openspy.tar.xz" local_filedir="${tmpdir}" - local_filename="UT3-linux-server-2.1.tar.xz" + local_filename="UT3-linux-server-2.1-openspy.tar.xz" chmodx="nochmodx" run="norun" force="noforce" - md5="8876cca61e3f83ea08db25208bde6ac6" + md5="f60b745613a8676666eb6a2450cbdc8e" elif [ "${shortname}" == "vs" ]; then remote_fileurl="http://linuxgsm.download/VampireSlayer/vs_l-6.0_full.tar.xz" local_filedir="${tmpdir}" From 2651c31695896ee577aaa82e1eb3e76c8977fe6d Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Sep 2024 22:06:12 +0100 Subject: [PATCH 07/17] add xnt icon --- lgsm/data/gameicons/xnt-icon.png | Bin 0 -> 6828 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 lgsm/data/gameicons/xnt-icon.png diff --git a/lgsm/data/gameicons/xnt-icon.png b/lgsm/data/gameicons/xnt-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f230eb407b9b936e571746c6ccf36baaacea2e3c GIT binary patch literal 6828 zcmeHLc{o(<`yUh`TP0blX-bIMhglj+mYD2IA&N0`FflXCjK;2%BqhWvOP17>5``p7 zs3g556h+C_8xm64mwtzOtM~eSuj_Zc*Y*4U*UWY1oO3^)`}5rQ=f0okI%i^RtW2dO zlq4V!h!n-l*bY2H7mpR9;4e2g_zQTt8|>i3v!n8%ejK(Z!xw<^g8Tp|5XkU^Kmt3M zHn!6DpeyG4*KCgz-b;wvS3$?W9E&zgFCS5bRhnk5_>eUzxnccT#WF3sn{9M=pw2U9 zi>WeNZG%6=s3^F%XHAoOQF>*P(!5xfwMcau@R!Gyr?PF%HqsH(=o2Y<*3Un~PvTCl z*!PgyH0P3cMe7AJKO}8ac(&LdK_6VIUQU#HjLP;}r6!ud#)K|!6g}|AWs?$tRge24 zch1>%!-e5NNT^VIsk78_?5Ai5MCd5P$jF9bWb}77U=A5!3A$$Y3{>je?CWH~D^iTY2yF_4^jO3Hu+{a6>!q z)xW4%@${44WdAywPg_MoVg5;j$4n}BkSiF28Iv(b^0#Q*@4tUWbYJ{b!cftl?2K4x zNix=(Zuj~A4v!lzYdK=Yi8-sD%0{o*og2DosOWA`Z1LW_8*RGNk|IG&)h7XIeaC6y z;#)Qu?vw%?+&39s-FYHr&2T+=juxj+L8Q6@D2`UPgnVM3*w-UnooP{n8h8y^k#aZR zS(@-b`|`AaR||Tj!|%kqBSZ^IN~=2{@AN2zw{AAcp~|FOU2kaz$&|eo+L^^`h*xQ_ zwpU+sXc9XkP(kq|zZBlCx;f!L1EF8O`j>Kdx9kc9jgZd1&Z=`&^C5!PE*XJ2r$Qoi zStr1PCZGt7cHfPJu)11;ExMx?{^^(4rFB#?j!@Tky0rZ0<23e<%y@shynMKclx zU4rm@bYV`GHc%rr2Y})bI0OoA6394+f$2#=$sD>T$RiG5stpf6%kI-&FwhKn7C%kZ1%7$z&pb_2BYM4uT}#1Nx61TnBKGBJBV!JAgw2 zOb!Ap-sWE^=(HdHegPccrF7^tB;X4$K`0lT75$GXO(~W(KRgyC@M19imb^f*|AFK& zJb#MykJuJRmeTn(5YYVx??2Fg=e`66QI?h@V>T^dF+7T~E^Kjr5}i$B&`C>|fCmll z;R#j(N6;q1ades|+ye{H;b=4#Pw?=-;&iZtU#KW7E|1Eh0gF^1If4Q5-~gO9P1{o& zt^??x;W(l;9!?~n=x_`k&<4=jcpVx6_X~wJhXHma)%Vw^7OChU6&g01h}FRoe}eV^94^?4i>zoA z;=3e^g&~3IfYMSII~62Y@&L0T8F2tAkIivlvwd}8i$OsbJ%0>af(wdH4!C_eEe7=aW&^h_a3@6m*b2Yv1;+Z{ z{Cuy&e{%{b^!FtHO5fjd{g&%rDe$krzq{+VT>naee+B;CUH@-#N&I}70$AV^5FdP1 zits;N016suW%$&Iph~(h=5IRPY^VWv{+?)Fw%H@#%?<1e8S%UQ}wBI$YDO zc<*_WXLdsgW1oeOw-iG;gJckNlwe80SddeXQqoI}PFg}~AGYYMyG}PR0-V_{J7rva zD4N5a$rAxj2RE*Q3BS#$!d4UcBdOf*>aNMmuIccINaSq(v>k_9>!Q{Zo$WfloUaI@JOB2o8<@O;$!YkJ+@*%h0iN@ zl0BvrHayx}QPCQ}Wmb+dHhr}gdRv))G$in~oZiCgqPI4m@mCxX<^2OU_#)fn6`(tw zBxJ}QI_6jAzIQ0^jQ{ZPD{ejf~{tN zZL*L_Q>z)N4$1Joe?ld&@BU<%yi7GLa;W~;!q_u6%n^gO{i-KxcV@ND6{~HC;0=vf zRCmqZjqNhod*q?R8u|fJ$TV?{;E#>Xg&c6uF{G^A z8kdYAm1*nywUb#%#O?mhQ8#H+LNXuh2f76goj0gWW}=TFE8lLxlPJo{8r$zzOe0h)_%8+ z(DDSqXRm}aJ?)Lj%NU!JPUTqwt^;zReR0AQt;zo8nXzB>rZ(}D0sk9UvyMGm|2%ni z`cjARoJU4!n`fFezR3UcOv{(RF00nA-sMfPS+?b^f$qa1Ln$K~8V&sFG5u=K>`QW~ z$1RNJ84yz9N)e80jLiDYfSClQ}KCRZ4A6uEJ$4nd?_V^;Uf(NX;C}b&b1l zd~1e7!CpiWHY3U_U0H8s==cC&qzV)0`ZHZv%^evdcjVGKIugWv{@~_pDUT0Sv2Xku zy8BRF&<1H0)>gd)PZvwY1a%xg`sIG*Eg5Z74bdV_8tW+P1(t?(hR>o7vPP9R-MXw^ zpGl~)RE4RXYG~vOt9}-4bu_(8z!b%gp&l)iyji{~TJR9J{5GQ2e)s2fH&;~#Uk3!j zUx%DtJPrv87kzPFLxMfl#~Dx=ES)lWwWai&LEXKRYU?jNxR>-;(jl7ECGMT~vCe(4 zoRwkEx^0T-jp6UF6UX!N9p4hCUUY;ig&3-kr_rUolEZmfS$`S(=nHnCmCP~g zC{**PM4fGlo7coOH#bujIUJ@un&K%}wSbw|XCAqCzenv77--;x5KlKhUDDl}J*0+`=Lv%_DPXo4_h6@C;2d$FT%^zl)s_4CCZL!vJz%y>nJxYC%|-w6 zf~^!yJug+E)f%|)pjy}(OPZ>$U8!NCO_YJRGPC zFhEnc8C+&4^5mR(X;{qWlwO_-V?>K*L+sk|be&nUd%5vaiOU>BlWS11EobG$Iky~lP@mU?U{v}Bh1tC?K_30v0Cab&8ueRk}+my znvb5>OY$UdvMsfoy!j>LF9q|LYl7BKxrz#Mau`a6E0zgU3C-A8r|U&0;$)=Hq`Mh_ zB;JBTb1oe@@L|+@P}7yO{Y;yBjQ8=oCzN=6h!MXVhuc*tdas$lIQvZcmPuJyCgsM{ zEnR&zqnM9pNr+1^gHkrGwni`|j~1niehtH4_$6P6MGCwFBSr9>kA4GXgAFDZdvWU* z1c6%0B2|U2x!Kd#U-EZJ;~sP(auJ$HByEbL*~~8ccky z7w2IAsV`V3A+pUT!wJ@ysJy05(Z=~YMCYr>Ikkn=K4n?mO#T@QMlLPkel_8Uw(j0) znL+V3ZJy4H>N5(JMpU)iE&eBB$HD)D`mlr|$HdX*>pkW!ZpIvzdR%INq^|Nrvwg&I z&GnaRtP(+d0O;2T`hS^?Csnt{vR_?g%K(kaBmMm(eRtSrgRbH`Q(C(} zMA(WuPPRWDxSchc=j2$Ssoj#$%=;LE4Pcd#9bQ+&=Fg>nTp`X5kIn7360&i*AzC`3 zD!|<}s>;}2lEowI6d$Y$JKgutnH)4SpF3M6A2Aae+Uy9USxbx)o%Oz|UTkQaEcO@{ z%eq|29Cq{alIU`o<)6QxJJfR9-$bgFKivIVa#Gl4Y%-b<{#L=2MbdG}^C1OPgx7c* zJD=KkZjNs~9fo9>zlbU%k1a1!fd4hHrGbLa`wb5^oa#R3Xw`V)rpoN#oz$QUPaZ@c95a<6=aCxu6PeXb3ru!h+{P;{ zF7?q9k6F*&`92}%+HxyGsK(9ximUFHTNw4LF+`<+?z?1-~_(XY<^8WLQq~;}4ul@zW;P+Q-wM^(SR6OjY9B zrrQn>(UrsRdJV>zK7S~91@B`4YU6W}!jNO4VshmS)AM67r>$;&xj7yc=QHvePp&N& z&80h+jA~H7R+rNt6PmUvCaZ1#JQ+~6-t5$ViANW9Z>66%d#Ry+sAWBE7k9!(Q21xU rzK%hSSF7yyyA?f+rKgm!(if^VBG7_in%y|~+zFwWSQ!@>x<~#Gf2SZ= literal 0 HcmV?d00001 From 6849815acd53de6216bed470215f5de7cdce89e6 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Sep 2024 22:10:40 +0100 Subject: [PATCH 08/17] add missing sm --- lgsm/data/debian-13.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/lgsm/data/debian-13.csv b/lgsm/data/debian-13.csv index af262abb6..5ddb19405 100644 --- a/lgsm/data/debian-13.csv +++ b/lgsm/data/debian-13.csv @@ -105,6 +105,7 @@ scpslsm,mono-complete sdtd,telnet,expect,libxml2-utils sf sfc,libtinfo5:i386 +sm,telnet,expect sof2 sol squad From 5ebeb1379b9c5a9340fb70c04fa9c558dc324abc Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Sep 2024 22:12:50 +0100 Subject: [PATCH 09/17] remove mom icon --- lgsm/data/gameicons/mom-icon.png | Bin 3025 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 lgsm/data/gameicons/mom-icon.png diff --git a/lgsm/data/gameicons/mom-icon.png b/lgsm/data/gameicons/mom-icon.png deleted file mode 100644 index 317b6010a9e19865cb56eb507aef10d03ce9ece6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3025 zcmV;?3oi7DP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 zVoOIv0RI600RN!9r;`8x010qNS#tmY4%h$y4%h()NRg%h000McNliru=L!%J3Lm#W z;+y~g3cyK3K~zY`1;J^IT=zi$@c;4d_vT%5?Hqf}uGhOhcJ0(hoThP2jGLxSgVI1l zA%Sm20xE&}p;YhzA&P{6N+2~VNr|XbTNM#bDx$_}qPWevwqtwkt=Hbed(H05&OP(q zn|Gi5e(>9$pUE&rD+C^;NcKPk&?SW!#V83lnhR{7VVIaC`kp1Q02Qw1w8|@T5{Pv2WUn3sZrpDZJfRyw z5EF(uND`Yuz!(go(CzvOqa|&xE-`ju=ul)hghGcLxTfCgN*tj|JdGiPXh;i9%Of%= z0_5(?6w+0X0+6; z+pVZvF6%%SlytA=77CIv+~t*tFo`Hjzx%WIPrdT{hZ>vjul(zmU;m2&S7t^3`sIK3 z4t50Fba}?Y6cKRn^0&XpV-lz^DZT%aKmr{Dk1_!tj=@P}t>-R^h(1|SYPx}H+f zsJXTL{tx?4ZpIN<-uR>d1w~;7>$e~N>?#0}2eiHYEru;tE`HS=DIA_$XwV~m=obWh;#PQG`0N|~?_tWb2tMg}`yZ+9PD_?#!vTfBw0Mpa2yz!5J^d~JZ6ilE7 zaJ#oYE}lH~m;W|CSpgQbo4cRA{SS?Yw<_5~zTWI#c=5k}dGGOoQ0=*2Ss;+-=%i+q zb448nvrnJ>^?zP|=X>Af3IN-PA1S+8J_)VhvwMGk;dy`a9*``lxKJofBF=m7``h-yM#he(|Xn-jGioJM!8$Nt(X$-*3fC>_r31b?}!CsU`%bdi$d^{Tm4E)B4h-cpER{gUwa+DJW4A{)+J(6lA@3o36{Z;4?}_=J(`Iy9^*2) z0aknA(spN?#u-UWlMI=ncm#{3V#q+&33cDwUN?TUxJHtCN=m=|!J}fP^vvn`;Xp@8 zgf)URKpYQUk(P}xpm=J8W(n4kp~5g?c0abM61)pDg#$G_VY9x!N3iofKTjU51SYv4@Quo zNRh((kyCX%*w)W3jEQ`DbEpY?=E~1MURtkh>^8P+WATIQkL$+8oFin$e}2mdeeKk7 za41WW!2&TU#ymkYC|quCGfW9|K{f1zp)o1YD(q6wf6V8$9i~+`Mn||}Rv~2O_Tq!B zYHxk523Bfe2w0vCg1{A$muJei>kiw+d^0NwlA&+N-@wOF_5ye8N1=k*5(q^>z)*n1QC@(b)&0eqGbQqK zg8#YaXJeVnK#o`mm1KMKzUw8JI?6=?6E*C>qVmmyhR9Gbi6BKdzV*g8F245aD?fSr z&Gp9z6BC8d*D!z-hKfW*v5zsdB1j_kL{67zCm)A@enFl1+H3D!r*N57x>`R?3k4^d`>-g zW*)$>J1~!*IDL2V#>XFj%u*~t5QE+z41CY?C`=$v`>idHi<*)o^GCl>d8)K))LOUh z5SDAqD1`${yS4=qIUR2` z?S+A7o6vXM7{;AAIjRcBC20A5oRhCDx2}A!2P@|Pd)>K>SzDztX-gZ<&zv?q(Bco2CZa!jX}$>bG* z!@g5d<%Rjmk?C1pqL4~e%2R2OIW%{6=F~a;U|`d5ePz}5Fqh&&XVD3GCiuwlN0Ls&rJs?yhl- ze{f97s)C&27>WpN3&)9N40~;jhz-B1^^HNx=rtR=-R^emb|Ryecv^@^E^xZL2iJa6 zt=9%eB}#~p&k!)sAPfl_V~)JKwEoe0_1UKn5hj`PLZ)xTAb`6&Eyt||i1A{)*BFka z^7{`PZGWjCswhraRmv;Mcu5{=`u=|X#%lGEp4b2_4UN&Xz%-)KtW0F&{Z1oV3Df2F+eQvhbRJ64ALwa2VsJ6*AF>~g^`2fuI2@?ByubQS&=1RYjq9+1W`DhOR<0~0GP5&7BV~)Vu~?6-)Go<081iH$3e?t z{~yfTzVn^T7qS2V03~!qSaf7zbY(hYa%Ew3WdJfTGBYhPFfB1QR53R?FgZFiH7hVM zIxsLqYPRzL001R)MObuXVRU6WZEs|0W_bWIFfubOF)%GLHdHY;IxsmpGc_wPFgh?W TH8&1V00000NkvXXu0mjfy342o From e9f6836aa15ea5cb0d6633ae7b5a25191ec3ff54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Sep 2024 22:14:11 +0100 Subject: [PATCH 10/17] build(deps): bump actions/add-to-project from 1.0.1 to 1.0.2 (#4603) Bumps [actions/add-to-project](https://github.com/actions/add-to-project) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/actions/add-to-project/releases) - [Commits](https://github.com/actions/add-to-project/compare/v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: actions/add-to-project dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/add-to-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml index fb092b649..e0b06990f 100644 --- a/.github/workflows/add-to-project.yml +++ b/.github/workflows/add-to-project.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Add to Project - uses: actions/add-to-project@v1.0.1 + uses: actions/add-to-project@v1.0.2 with: project-url: https://github.com/orgs/GameServerManagers/projects/11 github-token: ${{ secrets.ADD_TO_PROJECT_PAT }} From 608a2fb3c33e65387840c7c66d06f830fe87975d Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Sep 2024 22:26:36 +0100 Subject: [PATCH 11/17] Release v24.3.0 --- lgsm/modules/core_modules.sh | 2 +- linuxgsm.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/modules/core_modules.sh b/lgsm/modules/core_modules.sh index 7726559cc..10f6e0990 100644 --- a/lgsm/modules/core_modules.sh +++ b/lgsm/modules/core_modules.sh @@ -8,7 +8,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" -modulesversion="v24.2.4" +modulesversion="v24.3.0" # Core diff --git a/linuxgsm.sh b/linuxgsm.sh index 0bb918c0d..8c83cdc58 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -24,7 +24,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v24.2.4" +version="v24.3.0" shortname="core" gameservername="core" commandname="CORE" From 3fadfac2d18b2785b86c9e39df7a1cb2bccb3dfc Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Sep 2024 22:32:57 +0100 Subject: [PATCH 12/17] remove code that is not ready --- lgsm/modules/alert_discord.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lgsm/modules/alert_discord.sh b/lgsm/modules/alert_discord.sh index a447c498a..93eda8d5b 100644 --- a/lgsm/modules/alert_discord.sh +++ b/lgsm/modules/alert_discord.sh @@ -51,11 +51,6 @@ jsoninfo=$( "name": "Hostname", "value": "${HOSTNAME}", "inline": true - }, - { - "name": "Is my Game Server Online?", - "value": "https://ismygameserver.online/${querytype}/${alertip}:${queryport}", - "inline": true }, { "name": "More info", @@ -123,11 +118,6 @@ jsonnoinfo=$( "value": "${HOSTNAME}", "inline": true }, - { - "name": "Is my Game Server Online?", - "value": "https://ismygameserver.online/${querytype}/${alertip}:${queryport}", - "inline": true - }, { "name": "Server Time", "value": "$(date)", From d2bb7d1af654e828af7c6b2c698a86b992ac9754 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Sep 2024 22:38:01 +0100 Subject: [PATCH 13/17] fix: add check for npm --- lgsm/modules/check_gamedig.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/modules/check_gamedig.sh b/lgsm/modules/check_gamedig.sh index b1913cf87..70aeea41b 100644 --- a/lgsm/modules/check_gamedig.sh +++ b/lgsm/modules/check_gamedig.sh @@ -5,14 +5,14 @@ # Website: https://linuxgsm.com # Description: Installs nodejs and gamedig -if [ "$(command -v node)" ] && [ "$(node -v | cut -d 'v' -f 2 | cut -d '.' -f 1)" -ge 16 ] && [ ! -f "${lgsmdir}/node_modules/gamedig/bin/gamedig.js" ]; then +if [ "$(command -v node)" ] && [ "$(command -v npm)" ] && [ "$(node -v | cut -d 'v' -f 2 | cut -d '.' -f 1)" -ge 16 ] && [ ! -f "${lgsmdir}/node_modules/gamedig/bin/gamedig.js" ]; then echo -e "" echo -e "${bold}${lightyellow}Installing Gamedig${default}" fn_script_log_info "Installing Gamedig" cd "${lgsmdir}" || exit curl -L -o package.json "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/package.json" npm install -elif [ "$(command -v node)" ] && [ "$(node -v | cut -d 'v' -f 2 | cut -d '.' -f 1)" -ge 16 ]; then +elif [ "$(command -v node)" ] && [ "$(command -v npm)" ] && [ "$(node -v | cut -d 'v' -f 2 | cut -d '.' -f 1)" -ge 16 ]; then cd "${lgsmdir}" || exit curl -s -L -o package.json "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/package.json" npm update > /dev/null 2>&1 From b510672e251f0fe03dd899b217eed8d85ec4dee6 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Sep 2024 22:50:37 +0100 Subject: [PATCH 14/17] revert cp change --- lgsm/modules/install_config.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lgsm/modules/install_config.sh b/lgsm/modules/install_config.sh index 1517812c1..f4005c6f8 100644 --- a/lgsm/modules/install_config.sh +++ b/lgsm/modules/install_config.sh @@ -41,15 +41,15 @@ fn_default_config_remote() { fn_script_log_info "Copying ${servercfg} config file." if [ "${config}" == "${servercfgdefault}" ]; then mkdir -p "${servercfgdir}" - cp -v --update=none "${lgsmdir}/config-default/config-game/${config}" "${servercfgfullpath}" + cp -nv "${lgsmdir}/config-default/config-game/${config}" "${servercfgfullpath}" elif [ "${shortname}" == "arma3" ] && [ "${config}" == "${networkcfgdefault}" ]; then mkdir -p "${servercfgdir}" - cp -v --update=none "${lgsmdir}/config-default/config-game/${config}" "${networkcfgfullpath}" + cp -nv "${lgsmdir}/config-default/config-game/${config}" "${networkcfgfullpath}" elif [ "${shortname}" == "dst" ] && [ "${config}" == "${clustercfgdefault}" ]; then - cp -v --update=none "${lgsmdir}/config-default/config-game/${clustercfgdefault}" "${clustercfgfullpath}" + cp -nv "${lgsmdir}/config-default/config-game/${clustercfgdefault}" "${clustercfgfullpath}" else mkdir -p "${servercfgdir}" - cp -v --update=none "${lgsmdir}/config-default/config-game/${config}" "${servercfgdir}/${config}" + cp -nv "${lgsmdir}/config-default/config-game/${config}" "${servercfgdir}/${config}" fi done fn_sleep_time From aa4e4d9f947fbd13f13caa132828a9821dfdd95f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 23 Sep 2024 23:31:24 +0100 Subject: [PATCH 15/17] chore: update gamedig version v5.1.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e40e99e55..7fa277dcc 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,6 @@ }, "homepage": "https://github.com/GameServerManagers/LinuxGSM#readme", "dependencies": { - "gamedig": "^5.1.1" + "gamedig": "^5.1.3" } } From 975511fcd4be720530d2174494b116d0625f69e7 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 23 Sep 2024 23:57:25 +0100 Subject: [PATCH 16/17] fix: ensure lgsm/data refers to datadir variable --- .../details-check-generate-matrix.sh | 2 +- .../serverlist-validate-game-icons.sh | 2 +- .github/workflows/serverlist-validate.sh | 4 +- lgsm/modules/alert.sh | 2 +- lgsm/modules/alert_discord.sh | 12 +-- lgsm/modules/alert_rocketchat.sh | 4 +- lgsm/modules/alert_slack.sh | 4 +- lgsm/modules/check_deps.sh | 4 +- lgsm/modules/command_update_linuxgsm.sh | 10 +-- lgsm/modules/core_steamcmd.sh | 90 +++++++++---------- lgsm/modules/info_stats.sh | 4 +- lgsm/modules/mods_core.sh | 2 +- linuxgsm.sh | 2 +- 13 files changed, 71 insertions(+), 71 deletions(-) diff --git a/.github/workflows/details-check-generate-matrix.sh b/.github/workflows/details-check-generate-matrix.sh index bba9e8d5d..1f4bc1d53 100755 --- a/.github/workflows/details-check-generate-matrix.sh +++ b/.github/workflows/details-check-generate-matrix.sh @@ -1,6 +1,6 @@ #!/bin/bash -curl "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${GITHUB_REF#refs/heads/}/lgsm/data/serverlist.csv" | grep -v '^[[:blank:]]*$' > serverlist.csv +curl "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${GITHUB_REF#refs/heads/}/${datadir}/serverlist.csv" | grep -v '^[[:blank:]]*$' > serverlist.csv echo -n "{" > "shortnamearray.json" echo -n "\"include\":[" >> "shortnamearray.json" diff --git a/.github/workflows/serverlist-validate-game-icons.sh b/.github/workflows/serverlist-validate-game-icons.sh index ca41892c9..2fdb0ff8f 100755 --- a/.github/workflows/serverlist-validate-game-icons.sh +++ b/.github/workflows/serverlist-validate-game-icons.sh @@ -1,6 +1,6 @@ #!/bin/bash -cd "lgsm/data" || exit +cd "${datadir}" || exit echo "" echo "Checking that all the game servers listed in serverlist.csv have a shortname-icon.png file" diff --git a/.github/workflows/serverlist-validate.sh b/.github/workflows/serverlist-validate.sh index 0c7634018..7d931372d 100755 --- a/.github/workflows/serverlist-validate.sh +++ b/.github/workflows/serverlist-validate.sh @@ -2,7 +2,7 @@ echo "Checking that all the game servers are listed in all csv files" echo "this check will ensure serverlist.csv has the same number of lines (-2 lines) as the other csv files" # count the number of lines in the serverlist.csv -cd "lgsm/data" || exit +cd "${datadir}" || exit serverlistcount="$(tail -n +2 serverlist.csv | wc -l)" echo "serverlistcount: $serverlistcount" # get list of all csv files starting with ubunutu debian centos @@ -19,7 +19,7 @@ for csv in $csvlist; do fi done -# Compare all game servers listed in serverlist.csv to $shortname-icon.png files in lgsm/data/gameicons +# Compare all game servers listed in serverlist.csv to $shortname-icon.png files in ${datadir}/gameicons # if the game server is listed in serverlist.csv then it will have a $shortname-icon.png file # loop though shortname in serverlist.csv diff --git a/lgsm/modules/alert.sh b/lgsm/modules/alert.sh index f2698e3b7..814799e80 100644 --- a/lgsm/modules/alert.sh +++ b/lgsm/modules/alert.sh @@ -198,7 +198,7 @@ fn_alert_info() { } # Images -alerticon="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/gameicons/${shortname}-icon.png" +alerticon="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/gameicons/${shortname}-icon.png" if [ "${alert}" == "permissions" ]; then fn_alert_permissions diff --git a/lgsm/modules/alert_discord.sh b/lgsm/modules/alert_discord.sh index 93eda8d5b..6f362b4f7 100644 --- a/lgsm/modules/alert_discord.sh +++ b/lgsm/modules/alert_discord.sh @@ -11,14 +11,14 @@ jsoninfo=$( cat << EOF { "username": "LinuxGSM", - "avatar_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg", + "avatar_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg", "file": "content", "embeds": [ { "author": { "name": "LinuxGSM Alert", "url": "", - "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg" + "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg" }, "title": "${alerttitle}", "url": "", @@ -64,7 +64,7 @@ jsoninfo=$( } ], "footer": { - "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg", + "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg", "text": "Sent by LinuxGSM ${version}" } } @@ -77,14 +77,14 @@ jsonnoinfo=$( cat << EOF { "username": "LinuxGSM", - "avatar_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg", + "avatar_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg", "file": "content", "embeds": [ { "author": { "name": "LinuxGSM Alert", "url": "", - "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg" + "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg" }, "title": "${alerttitle}", "url": "", @@ -125,7 +125,7 @@ jsonnoinfo=$( } ], "footer": { - "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg", + "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg", "text": "Sent by LinuxGSM ${version}" } } diff --git a/lgsm/modules/alert_rocketchat.sh b/lgsm/modules/alert_rocketchat.sh index bff2c6a0b..d0077c5f9 100644 --- a/lgsm/modules/alert_rocketchat.sh +++ b/lgsm/modules/alert_rocketchat.sh @@ -18,7 +18,7 @@ jsoninfo=$( "color": "${alertcolourhex}", "author_name": "LinuxGSM Alert", "author_link": "https://linuxgsm.com", - "author_icon": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg", + "author_icon": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg", "thumb_url": "${alerticon}", "text": "", "fields": [ @@ -75,7 +75,7 @@ jsonnoinfo=$( "color": "${alertcolourhex}", "author_name": "LinuxGSM Alert", "author_link": "https://linuxgsm.com", - "author_icon": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg", + "author_icon": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg", "thumb_url": "${alerticon}", "text": "", "fields": [ diff --git a/lgsm/modules/alert_slack.sh b/lgsm/modules/alert_slack.sh index 58dc54772..f6c6e503c 100644 --- a/lgsm/modules/alert_slack.sh +++ b/lgsm/modules/alert_slack.sh @@ -70,7 +70,7 @@ jsonnoinfo=$( "elements": [ { "type": "image", - "image_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg", + "image_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg", "alt_text": "LinuxGSM icon" }, { @@ -157,7 +157,7 @@ jsoninfo=$( "elements": [ { "type": "image", - "image_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg", + "image_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg", "alt_text": "LinuxGSM icon" }, { diff --git a/lgsm/modules/check_deps.sh b/lgsm/modules/check_deps.sh index 35145a11d..67e0c8ba7 100644 --- a/lgsm/modules/check_deps.sh +++ b/lgsm/modules/check_deps.sh @@ -358,9 +358,9 @@ info_distro.sh if [ ! -f "${tmpdir}/dependency-no-check.tmp" ] && [ ! -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then # Check that the distro dependency csv file exists. - fn_check_file_github "lgsm/data" "${distroid}-${distroversioncsv}.csv" + fn_check_file_github "${datadir}" "${distroid}-${distroversioncsv}.csv" if [ -n "${checkflag}" ] && [ "${checkflag}" == "0" ]; then - fn_fetch_file_github "lgsm/data" "${distroid}-${distroversioncsv}.csv" "lgsm/data" "chmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}" "${distroid}-${distroversioncsv}.csv" "${datadir}" "chmodx" "norun" "noforce" "nohash" fi fi diff --git a/lgsm/modules/command_update_linuxgsm.sh b/lgsm/modules/command_update_linuxgsm.sh index e6e5e711d..27adf9b71 100644 --- a/lgsm/modules/command_update_linuxgsm.sh +++ b/lgsm/modules/command_update_linuxgsm.sh @@ -160,9 +160,9 @@ if [ -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then echo -en "checking ${remotereponame} config ${distroid}-${distroversioncsv}.csv...\c" fn_script_log_info "Checking ${remotereponame} ${distroid}-${distroversioncsv}.csv" if [ "${remotereponame}" == "GitHub" ]; then - curl ${nocache} --connect-timeout 3 -IsfL "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/${distroid}-${distroversioncsv}.csv" 1> /dev/null + curl ${nocache} --connect-timeout 3 -IsfL "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/${distroid}-${distroversioncsv}.csv" 1> /dev/null else - curl ${nocache} --connect-timeout 3 -IsfL "https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/lgsm/data/${distroid}-${distroversioncsv}.csv" 1> /dev/null + curl ${nocache} --connect-timeout 3 -IsfL "https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/${datadir}/${distroid}-${distroversioncsv}.csv" 1> /dev/null fi if [ $? != "0" ]; then fn_print_fail_eol_nl @@ -172,16 +172,16 @@ if [ -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then fi if [ "${remotereponame}" == "GitHub" ]; then - config_file_diff=$(diff "${datadir}/${distroid}-${distroversioncsv}.csv" <(curl ${nocache} --connect-timeout 3 -s "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/${distroid}-${distroversioncsv}.csv")) + config_file_diff=$(diff "${datadir}/${distroid}-${distroversioncsv}.csv" <(curl ${nocache} --connect-timeout 3 -s "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/${distroid}-${distroversioncsv}.csv")) else - config_file_diff=$(diff "${datadir}/${distroid}-${distroversioncsv}.csv" <(curl ${nocache} --connect-timeout 3 -s "https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/lgsm/data/${distroid}-${distroversioncsv}.csv")) + config_file_diff=$(diff "${datadir}/${distroid}-${distroversioncsv}.csv" <(curl ${nocache} --connect-timeout 3 -s "https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/${datadir}/${distroid}-${distroversioncsv}.csv")) fi if [ "${config_file_diff}" != "" ]; then fn_print_update_eol_nl fn_script_log_update "Checking ${remotereponame} ${distroid}-${distroversioncsv}.csv" rm -f "${datadir:?}/${distroid}-${distroversioncsv}.csv" - fn_fetch_file_github "lgsm/data" "${distroid}-${distroversioncsv}.csv" "${datadir}" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}" "${distroid}-${distroversioncsv}.csv" "${datadir}" "nochmodx" "norun" "noforce" "nohash" else fn_print_ok_eol_nl fn_script_log_pass "Checking ${remotereponame} ${distroid}-${distroversioncsv}.csv" diff --git a/lgsm/modules/core_steamcmd.sh b/lgsm/modules/core_steamcmd.sh index 552ff1905..e08c921dd 100644 --- a/lgsm/modules/core_steamcmd.sh +++ b/lgsm/modules/core_steamcmd.sh @@ -364,63 +364,63 @@ fn_check_steamcmd_appmanifest() { fn_print_info_nl "Forcing update to correct issue" fn_script_log_info "Forcing update to correct issue" if [ "${shortname}" == "ahl" ]; then - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" elif [ "${shortname}" == "bb" ]; then - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" elif [ "${shortname}" == "cscz" ]; then - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_80.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_80.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" elif [ "${shortname}" == "css" ]; then - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" elif [ "${shortname}" == "dmc" ]; then - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_40.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_40.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" elif [ "${shortname}" == "dod" ]; then - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_30.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_30.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" elif [ "${shortname}" == "hldm" ]; then - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" elif [ "${shortname}" == "ns" ]; then - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" elif [ "${shortname}" == "opfor" ]; then - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_50.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_50.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" elif [ "${shortname}" == "ricochet" ]; then - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_60.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_60.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" elif [ "${shortname}" == "tfc" ]; then - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_20.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_20.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" elif [ "${shortname}" == "ts" ]; then - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" elif [ "${shortname}" == "vs" ]; then - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" - fn_fetch_file_github "lgsm/data/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_90.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_10.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" + fn_fetch_file_github "${datadir}/appmanifest/${shortname}" "appmanifest_70.acf" "${serverfiles}/steamapps" "nochmodx" "norun" "noforce" "nohash" fi fn_dl_steamcmd fi diff --git a/lgsm/modules/info_stats.sh b/lgsm/modules/info_stats.sh index c8a96552a..b995d0e3b 100644 --- a/lgsm/modules/info_stats.sh +++ b/lgsm/modules/info_stats.sh @@ -23,10 +23,10 @@ fi if [ ! -f "${datadir}/uuid-${selfname}.txt" ] || [ ! -f "${datadir}/uuid-install.txt" ]; then # download dictionary words if [ ! -f "${datadir}/name-left.csv" ]; then - fn_fetch_file_github "lgsm/data" "name-left.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nohash" + fn_fetch_file_github "${datadir}" "name-left.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nohash" fi if [ ! -f "${datadir}/name-right.csv" ]; then - fn_fetch_file_github "lgsm/data" "name-right.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nohash" + fn_fetch_file_github "${datadir}" "name-right.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nohash" fi # generate instance uuid diff --git a/lgsm/modules/mods_core.sh b/lgsm/modules/mods_core.sh index aa24d903f..47bef26f7 100644 --- a/lgsm/modules/mods_core.sh +++ b/lgsm/modules/mods_core.sh @@ -412,7 +412,7 @@ fn_create_mods_dir() { fi fi - # Create lgsm/data/${modsinstalledlist}. + # Create ${datadir}/${modsinstalledlist}. if [ ! -f "${modsinstalledlistfullpath}" ]; then touch "${modsinstalledlistfullpath}" fn_script_log_info "Created ${modsinstalledlistfullpath}" diff --git a/linuxgsm.sh b/linuxgsm.sh index 8c83cdc58..047678875 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -345,7 +345,7 @@ fi # LinuxGSM installer mode. if [ "${shortname}" == "core" ]; then # Download the latest serverlist. This is the complete list of all supported servers. - fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5" + fn_bootstrap_fetch_file_github "${datadir}" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5" if [ ! -f "${serverlist}" ]; then echo -e "[ FAIL ] serverlist.csv could not be loaded." exit 1 From 56e422be452ef31e5d7a50dc5d86e945642d3afb Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 24 Sep 2024 22:06:20 +0100 Subject: [PATCH 17/17] feat: upgrade docker containers to ubuntu 24.04 (#4669) --- lgsm/data/serverlist.csv | 268 +++++++++++++++++++-------------------- 1 file changed, 134 insertions(+), 134 deletions(-) diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index 8b408f84f..0f350b55d 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -1,138 +1,138 @@ shortname,gameservername,gamename,os -ac,acserver,Assetto Corsa,ubuntu-22.04 -ahl,ahlserver,Action Half-Life,ubuntu-22.04 -ahl2,ahl2server,Action: Source,ubuntu-20.04 -ark,arkserver,ARK: Survival Evolved,ubuntu-22.04 -arma3,arma3server,ARMA 3,ubuntu-22.04 -armar,armarserver,Arma Reforger,ubuntu-20.04 -ats,atsserver,American Truck Simulator,ubuntu-22.04 -av,avserver,Avorion,ubuntu-22.04 -bb,bbserver,BrainBread,ubuntu-22.04 -bb2,bb2server,BrainBread 2,ubuntu-22.04 -bd,bdserver,Base Defense,ubuntu-22.04 -bf1942,bf1942server,Battlefield 1942,ubuntu-22.04 -bfv,bfvserver,Battlefield: Vietnam,ubuntu-22.04 -bmdm,bmdmserver,Black Mesa: Deathmatch,ubuntu-22.04 -bo,boserver,Ballistic Overkill,ubuntu-22.04 -bs,bsserver,Blade Symphony,ubuntu-22.04 -bt,btserver,Barotrauma,ubuntu-22.04 +ac,acserver,Assetto Corsa,ubuntu-24.04 +ahl,ahlserver,Action Half-Life,ubuntu-24.04 +ahl2,ahl2server,Action: Source,ubuntu-24.04 +ark,arkserver,ARK: Survival Evolved,ubuntu-24.04 +arma3,arma3server,ARMA 3,ubuntu-24.04 +armar,armarserver,Arma Reforger,ubuntu-24.04 +ats,atsserver,American Truck Simulator,ubuntu-24.04 +av,avserver,Avorion,ubuntu-24.04 +bb,bbserver,BrainBread,ubuntu-24.04 +bb2,bb2server,BrainBread 2,ubuntu-24.04 +bd,bdserver,Base Defense,ubuntu-24.04 +bf1942,bf1942server,Battlefield 1942,ubuntu-24.04 +bfv,bfvserver,Battlefield: Vietnam,ubuntu-24.04 +bmdm,bmdmserver,Black Mesa: Deathmatch,ubuntu-24.04 +bo,boserver,Ballistic Overkill,ubuntu-24.04 +bs,bsserver,Blade Symphony,ubuntu-24.04 +bt,btserver,Barotrauma,ubuntu-24.04 btl,btlserver,BATTALION: Legacy,ubuntu-20.04 -cc,ccserver,Codename CURE,ubuntu-22.04 -ck,ckserver,Core Keeper,ubuntu-22.04 -cmw,cmwserver,Chivalry: Medieval Warfare,ubuntu-22.04 -cod,codserver,Call of Duty,ubuntu-22.04 -cod2,cod2server,Call of Duty 2,ubuntu-22.04 -cod4,cod4server,Call of Duty 4,ubuntu-22.04 -coduo,coduoserver,Call of Duty: United Offensive,ubuntu-22.04 -codwaw,codwawserver,Call of Duty: World at War,ubuntu-22.04 -col,colserver,Colony Survival,ubuntu-22.04 -cs,csserver,Counter-Strike 1.6,ubuntu-22.04 -cs2,cs2server,Counter-Strike 2,ubuntu-22.04 -cscz,csczserver,Counter-Strike: Condition Zero,ubuntu-22.04 -csgo,csgoserver,Counter-Strike: Global Offensive,ubuntu-22.04 -css,cssserver,Counter-Strike: Source,ubuntu-22.04 -ct,ctserver,Craftopia,ubuntu-22.04 -dab,dabserver,Double Action: Boogaloo,ubuntu-22.04 -dayz,dayzserver,DayZ,ubuntu-22.04 -dmc,dmcserver,Deathmatch Classic,ubuntu-22.04 -dod,dodserver,Day of Defeat,ubuntu-22.04 -dodr,dodrserver,Day of Dragons,ubuntu-22.04 -dods,dodsserver,Day of Defeat: Source,ubuntu-22.04 -doi,doiserver,Day of Infamy,ubuntu-22.04 -dst,dstserver,Don't Starve Together,ubuntu-22.04 -dys,dysserver,Dystopia,ubuntu-22.04 -eco,ecoserver,Eco,ubuntu-22.04 -em,emserver,Empires Mod,ubuntu-22.04 -etl,etlserver,ET: Legacy,ubuntu-22.04 -ets2,ets2server,Euro Truck Simulator 2,ubuntu-22.04 -fctr,fctrserver,Factorio,ubuntu-22.04 -fof,fofserver,Fistful of Frags,ubuntu-22.04 -gmod,gmodserver,Garrys Mod,ubuntu-22.04 -hcu,hcuserver,HYPERCHARGE: Unboxed,ubuntu-22.04 -hl2dm,hl2dmserver,Half-Life 2: Deathmatch,ubuntu-22.04 -hldm,hldmserver,Half-Life: Deathmatch,ubuntu-22.04 -hldms,hldmsserver,Half-Life Deathmatch: Source,ubuntu-22.04 -hw,hwserver,Hurtworld,ubuntu-22.04 -hz,hzserver,Humanitz,ubuntu-22.04 -ins,insserver,Insurgency,ubuntu-22.04 -inss,inssserver,Insurgency: Sandstorm,ubuntu-22.04 -ios,iosserver,IOSoccer,ubuntu-22.04 -jc2,jc2server,Just Cause 2,ubuntu-22.04 -jc3,jc3server,Just Cause 3,ubuntu-22.04 -jk2,jk2server,Jedi Knight II: Jedi Outcast,ubuntu-22.04 -kf,kfserver,Killing Floor,ubuntu-22.04 -kf2,kf2server,Killing Floor 2,ubuntu-22.04 -l4d,l4dserver,Left 4 Dead,ubuntu-22.04 -l4d2,l4d2server,Left 4 Dead 2,ubuntu-22.04 -mc,mcserver,Minecraft,ubuntu-22.04 -mcb,mcbserver,Minecraft Bedrock,ubuntu-22.04 -mh,mhserver,MORDHAU,ubuntu-22.04 -mohaa,mohaaserver,Medal of Honor: Allied Assault,ubuntu-22.04 -mta,mtaserver,Multi Theft Auto,ubuntu-22.04 -nd,ndserver,Nuclear Dawn,ubuntu-22.04 -nec,necserver,Necesse,ubuntu-22.04 -nmrih,nmrihserver,No More Room in Hell,ubuntu-22.04 -ns,nsserver,Natural Selection,ubuntu-22.04 -ns2,ns2server,Natural Selection 2,ubuntu-22.04 -ns2c,ns2cserver,NS2: Combat,ubuntu-22.04 -ohd,ohdserver,Operation: Harsh Doorstop,ubuntu-22.04 +cc,ccserver,Codename CURE,ubuntu-24.04 +ck,ckserver,Core Keeper,ubuntu-24.04 +cmw,cmwserver,Chivalry: Medieval Warfare,ubuntu-24.04 +cod,codserver,Call of Duty,ubuntu-24.04 +cod2,cod2server,Call of Duty 2,ubuntu-24.04 +cod4,cod4server,Call of Duty 4,ubuntu-24.04 +coduo,coduoserver,Call of Duty: United Offensive,ubuntu-24.04 +codwaw,codwawserver,Call of Duty: World at War,ubuntu-24.04 +col,colserver,Colony Survival,ubuntu-24.04 +cs,csserver,Counter-Strike 1.6,ubuntu-24.04 +cs2,cs2server,Counter-Strike 2,ubuntu-24.04 +cscz,csczserver,Counter-Strike: Condition Zero,ubuntu-24.04 +csgo,csgoserver,Counter-Strike: Global Offensive,ubuntu-24.04 +css,cssserver,Counter-Strike: Source,ubuntu-24.04 +ct,ctserver,Craftopia,ubuntu-24.04 +dab,dabserver,Double Action: Boogaloo,ubuntu-24.04 +dayz,dayzserver,DayZ,ubuntu-24.04 +dmc,dmcserver,Deathmatch Classic,ubuntu-24.04 +dod,dodserver,Day of Defeat,ubuntu-24.04 +dodr,dodrserver,Day of Dragons,ubuntu-24.04 +dods,dodsserver,Day of Defeat: Source,ubuntu-24.04 +doi,doiserver,Day of Infamy,ubuntu-24.04 +dst,dstserver,Don't Starve Together,ubuntu-24.04 +dys,dysserver,Dystopia,ubuntu-24.04 +eco,ecoserver,Eco,ubuntu-24.04 +em,emserver,Empires Mod,ubuntu-24.04 +etl,etlserver,ET: Legacy,ubuntu-24.04 +ets2,ets2server,Euro Truck Simulator 2,ubuntu-24.04 +fctr,fctrserver,Factorio,ubuntu-24.04 +fof,fofserver,Fistful of Frags,ubuntu-24.04 +gmod,gmodserver,Garrys Mod,ubuntu-24.04 +hcu,hcuserver,HYPERCHARGE: Unboxed,ubuntu-24.04 +hl2dm,hl2dmserver,Half-Life 2: Deathmatch,ubuntu-24.04 +hldm,hldmserver,Half-Life: Deathmatch,ubuntu-24.04 +hldms,hldmsserver,Half-Life Deathmatch: Source,ubuntu-24.04 +hw,hwserver,Hurtworld,ubuntu-24.04 +hz,hzserver,Humanitz,ubuntu-24.04 +ins,insserver,Insurgency,ubuntu-24.04 +inss,inssserver,Insurgency: Sandstorm,ubuntu-24.04 +ios,iosserver,IOSoccer,ubuntu-24.04 +jc2,jc2server,Just Cause 2,ubuntu-24.04 +jc3,jc3server,Just Cause 3,ubuntu-24.04 +jk2,jk2server,Jedi Knight II: Jedi Outcast,ubuntu-24.04 +kf,kfserver,Killing Floor,ubuntu-24.04 +kf2,kf2server,Killing Floor 2,ubuntu-24.04 +l4d,l4dserver,Left 4 Dead,ubuntu-24.04 +l4d2,l4d2server,Left 4 Dead 2,ubuntu-24.04 +mc,mcserver,Minecraft,ubuntu-24.04 +mcb,mcbserver,Minecraft Bedrock,ubuntu-24.04 +mh,mhserver,MORDHAU,ubuntu-24.04 +mohaa,mohaaserver,Medal of Honor: Allied Assault,ubuntu-24.04 +mta,mtaserver,Multi Theft Auto,ubuntu-24.04 +nd,ndserver,Nuclear Dawn,ubuntu-24.04 +nec,necserver,Necesse,ubuntu-24.04 +nmrih,nmrihserver,No More Room in Hell,ubuntu-24.04 +ns,nsserver,Natural Selection,ubuntu-24.04 +ns2,ns2server,Natural Selection 2,ubuntu-24.04 +ns2c,ns2cserver,NS2: Combat,ubuntu-24.04 +ohd,ohdserver,Operation: Harsh Doorstop,ubuntu-24.04 onset,onsetserver,Onset,ubuntu-20.04 -opfor,opforserver,Opposing Force,ubuntu-22.04 -pc,pcserver,Project Cars,ubuntu-22.04 -pc2,pc2server,Project Cars 2,ubuntu-22.04 -pmc,pmcserver,PaperMC,ubuntu-22.04 -ps,psserver,Post Scriptum,ubuntu-22.04 -pvkii,pvkiiserver,Pirates Vikings & Knights II,ubuntu-22.04 -pvr,pvrserver,Pavlov VR,ubuntu-22.04 -pw,pwserver,Palworld,ubuntu-22.04 -pz,pzserver,Project Zomboid,ubuntu-22.04 -q2,q2server,Quake 2,ubuntu-22.04 -q3,q3server,Quake 3: Arena,ubuntu-22.04 -q4,q4server,Quake 4,ubuntu-22.04 -ql,qlserver,Quake Live,ubuntu-22.04 -qw,qwserver,Quake World,ubuntu-22.04 -ricochet,ricochetserver,Ricochet,ubuntu-22.04 -ro,roserver,Red Orchestra: Ostfront 41-45,ubuntu-22.04 -rtcw,rtcwserver,Return to Castle Wolfenstein,ubuntu-22.04 -rust,rustserver,Rust,ubuntu-22.04 -rw,rwserver,Rising World,ubuntu-22.04 -samp,sampserver,San Andreas Multiplayer,ubuntu-22.04 -sb,sbserver,Starbound,ubuntu-22.04 -sbots,sbotsserver,StickyBots,ubuntu-22.04 -scpsl,scpslserver,SCP: Secret Laboratory,ubuntu-22.04 -scpslsm,scpslsmserver,SCP: Secret Laboratory ServerMod,ubuntu-22.04 -sdtd,sdtdserver,7 Days to Die,ubuntu-22.04 -sf,sfserver,Satisfactory,ubuntu-22.04 -sfc,sfcserver,SourceForts Classic,ubuntu-22.04 -sm,smserver,Soulmask,ubuntu-22.04 -sof2,sof2server,Soldier Of Fortune 2: Gold Edition,ubuntu-22.04 -sol,solserver,Soldat,ubuntu-22.04 -squad,squadserver,Squad,ubuntu-22.04 -st,stserver,Stationeers,ubuntu-22.04 -stn,stnserver,Survive the Nights,ubuntu-22.04 +opfor,opforserver,Opposing Force,ubuntu-24.04 +pc,pcserver,Project Cars,ubuntu-24.04 +pc2,pc2server,Project Cars 2,ubuntu-24.04 +pmc,pmcserver,PaperMC,ubuntu-24.04 +ps,psserver,Post Scriptum,ubuntu-24.04 +pvkii,pvkiiserver,Pirates Vikings & Knights II,ubuntu-24.04 +pvr,pvrserver,Pavlov VR,ubuntu-24.04 +pw,pwserver,Palworld,ubuntu-24.04 +pz,pzserver,Project Zomboid,ubuntu-24.04 +q2,q2server,Quake 2,ubuntu-24.04 +q3,q3server,Quake 3: Arena,ubuntu-24.04 +q4,q4server,Quake 4,ubuntu-24.04 +ql,qlserver,Quake Live,ubuntu-24.04 +qw,qwserver,Quake World,ubuntu-24.04 +ricochet,ricochetserver,Ricochet,ubuntu-24.04 +ro,roserver,Red Orchestra: Ostfront 41-45,ubuntu-24.04 +rtcw,rtcwserver,Return to Castle Wolfenstein,ubuntu-24.04 +rust,rustserver,Rust,ubuntu-24.04 +rw,rwserver,Rising World,ubuntu-24.04 +samp,sampserver,San Andreas Multiplayer,ubuntu-24.04 +sb,sbserver,Starbound,ubuntu-24.04 +sbots,sbotsserver,StickyBots,ubuntu-24.04 +scpsl,scpslserver,SCP: Secret Laboratory,ubuntu-24.04 +scpslsm,scpslsmserver,SCP: Secret Laboratory ServerMod,ubuntu-24.04 +sdtd,sdtdserver,7 Days to Die,ubuntu-24.04 +sf,sfserver,Satisfactory,ubuntu-24.04 +sfc,sfcserver,SourceForts Classic,ubuntu-24.04 +sm,smserver,Soulmask,ubuntu-24.04 +sof2,sof2server,Soldier Of Fortune 2: Gold Edition,ubuntu-24.04 +sol,solserver,Soldat,ubuntu-24.04 +squad,squadserver,Squad,ubuntu-24.04 +st,stserver,Stationeers,ubuntu-24.04 +stn,stnserver,Survive the Nights,ubuntu-24.04 sven,svenserver,Sven Co-op,ubuntu-20.04 -terraria,terrariaserver,Terraria,ubuntu-22.04 -tf,tfserver,The Front,ubuntu-22.04 -tf2,tf2server,Team Fortress 2,ubuntu-22.04 -tfc,tfcserver,Team Fortress Classic,ubuntu-22.04 -ti,tiserver,The Isle,ubuntu-22.04 -ts,tsserver,The Specialists,ubuntu-22.04 -ts3,ts3server,Teamspeak 3,ubuntu-22.04 -tu,tuserver,Tower Unite,ubuntu-22.04 -tw,twserver,Teeworlds,ubuntu-22.04 -unt,untserver,Unturned,ubuntu-22.04 -ut,utserver,Unreal Tournament,ubuntu-22.04 -ut2k4,ut2k4server,Unreal Tournament 2004,ubuntu-22.04 -ut3,ut3server,Unreal Tournament 3,ubuntu-22.04 -ut99,ut99server,Unreal Tournament 99,ubuntu-22.04 -vh,vhserver,Valheim,ubuntu-22.04 -vints,vintsserver,Vintage Story,ubuntu-22.04 -vpmc,vpmcserver,Velocity Proxy MC,ubuntu-22.04 -vs,vsserver,Vampire Slayer,ubuntu-22.04 -wet,wetserver,Wolfenstein: Enemy Territory,ubuntu-22.04 -wf,wfserver,Warfork,ubuntu-22.04 -wmc,wmcserver,WaterfallMC,ubuntu-22.04 -wurm,wurmserver,Wurm Unlimited,ubuntu-22.04 -xnt,xntserver,Xonotic,ubuntu-22.04 -zmr,zmrserver,Zombie Master: Reborn,ubuntu-22.04 -zps,zpsserver,Zombie Panic! Source,ubuntu-22.04 +terraria,terrariaserver,Terraria,ubuntu-24.04 +tf,tfserver,The Front,ubuntu-24.04 +tf2,tf2server,Team Fortress 2,ubuntu-24.04 +tfc,tfcserver,Team Fortress Classic,ubuntu-24.04 +ti,tiserver,The Isle,ubuntu-24.04 +ts,tsserver,The Specialists,ubuntu-24.04 +ts3,ts3server,Teamspeak 3,ubuntu-24.04 +tu,tuserver,Tower Unite,ubuntu-24.04 +tw,twserver,Teeworlds,ubuntu-24.04 +unt,untserver,Unturned,ubuntu-24.04 +ut,utserver,Unreal Tournament,ubuntu-24.04 +ut2k4,ut2k4server,Unreal Tournament 2004,ubuntu-24.04 +ut3,ut3server,Unreal Tournament 3,ubuntu-24.04 +ut99,ut99server,Unreal Tournament 99,ubuntu-24.04 +vh,vhserver,Valheim,ubuntu-24.04 +vints,vintsserver,Vintage Story,ubuntu-24.04 +vpmc,vpmcserver,Velocity Proxy MC,ubuntu-24.04 +vs,vsserver,Vampire Slayer,ubuntu-24.04 +wet,wetserver,Wolfenstein: Enemy Territory,ubuntu-24.04 +wf,wfserver,Warfork,ubuntu-24.04 +wmc,wmcserver,WaterfallMC,ubuntu-24.04 +wurm,wurmserver,Wurm Unlimited,ubuntu-24.04 +xnt,xntserver,Xonotic,ubuntu-24.04 +zmr,zmrserver,Zombie Master: Reborn,ubuntu-24.04 +zps,zpsserver,Zombie Panic! Source,ubuntu-24.04