From f25f643ae0995e5b784e2c2e36c25203135e8e1f Mon Sep 17 00:00:00 2001 From: CedarLUG <19336442+cedarlug@users.noreply.github.com> Date: Sun, 17 Dec 2017 14:31:41 -0600 Subject: [PATCH 01/18] Replacing realpath dependency and idosyncracies. --- lgsm/functions/command_backup.sh | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 4225a2c5e..5dd066109 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -112,7 +112,8 @@ fn_backup_compression(){ sleep 2 fn_print_dots "Backup (${rootdirduexbackup}) ${backupname}.tar.gz, in progress..." fn_script_log_info "backup ${rootdirduexbackup} ${backupname}.tar.gz, in progress" - excludedir=$(realpath --relative-to="${rootdir}" "${backupdir}") + excludedir=fn_backup_relpath + # CHECK THAT excludedir isn't empty. Sanity check here -CedarLUG tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "${excludedir}" ./* local exitcode=$? if [ ${exitcode} -ne 0 ]; then @@ -180,6 +181,35 @@ fn_backup_prune(){ fi } +fn_backup_relpath() { + # Written by CedarLUG as a "realpath --relative-to" alternative in bash + declare -a rdirtoks=($(readlink -f "${rootdir}" | sed "s/\// /g")) + # CHECK THAT the array is populated correctly. Sanity check here -CedarLUG + declare -a bdirtoks=($(readlink -f "${backupdir}" | sed "s/\// /g")) + # CHECK THAT the array is populated correctly. Sanity check here -CedarLUG + + for ((base=0; $base<${#rdirtoks[@]}; base++)) ; + do + [[ "${rdirtoks[$base]}" != "${bdirtoks[$base]}" ]] && break + done + + for ((x=${base};$x<${#rdirtoks[@]};x++)) + do + echo -n "../" + done + + for ((x=${base};$x<$(( ${#bdirtoks[@]} - 1 ));x++)) + do + echo -n "${bdirtoks[$x]}/" + done + + if (( "$base" < "${#bdirtoks[@]}" )) ; then + echo ${bdirtoks[ $(( ${#bdirtoks[@]} - 1)) ]} + else + echo + fi +} + # Restart the server if it was stopped for the backup fn_backup_start_server(){ if [ "${serverstopped}" == "yes" ]; then From e8392f664021ecd5e52128babbf60d790dd098b3 Mon Sep 17 00:00:00 2001 From: CedarLUG <19336442+cedarlug@users.noreply.github.com> Date: Sun, 17 Dec 2017 16:18:18 -0600 Subject: [PATCH 02/18] Bad semicolon. --- lgsm/functions/command_backup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 5dd066109..9b3618ce9 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -188,7 +188,7 @@ fn_backup_relpath() { declare -a bdirtoks=($(readlink -f "${backupdir}" | sed "s/\// /g")) # CHECK THAT the array is populated correctly. Sanity check here -CedarLUG - for ((base=0; $base<${#rdirtoks[@]}; base++)) ; + for ((base=0; $base<${#rdirtoks[@]}; base++)) do [[ "${rdirtoks[$base]}" != "${bdirtoks[$base]}" ]] && break done From ff359e1af1044937d62f8d071201231ec18a4427 Mon Sep 17 00:00:00 2001 From: CedarLUG <19336442+cedarlug@users.noreply.github.com> Date: Mon, 18 Dec 2017 09:26:54 -0600 Subject: [PATCH 03/18] Function call syntax error --- lgsm/functions/command_backup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 9b3618ce9..ea9647c4d 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -112,7 +112,7 @@ fn_backup_compression(){ sleep 2 fn_print_dots "Backup (${rootdirduexbackup}) ${backupname}.tar.gz, in progress..." fn_script_log_info "backup ${rootdirduexbackup} ${backupname}.tar.gz, in progress" - excludedir=fn_backup_relpath + excludedir=$(fn_backup_relpath) # CHECK THAT excludedir isn't empty. Sanity check here -CedarLUG tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "${excludedir}" ./* local exitcode=$? From 65d9229ee97e8448381c876ed284e83c9f606b3f Mon Sep 17 00:00:00 2001 From: Nathan <4490380+Grimston@users.noreply.github.com> Date: Wed, 27 Dec 2017 17:36:21 +0800 Subject: [PATCH 04/18] Update command_start.sh Correct the width and height argument order for the tmux session. --- lgsm/functions/command_start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh index 6bad48141..96aa7b8e4 100644 --- a/lgsm/functions/command_start.sh +++ b/lgsm/functions/command_start.sh @@ -98,7 +98,7 @@ fn_start_tmux(){ # Create lockfile date > "${rootdir}/${lockselfname}" cd "${executabledir}" - tmux new-session -d -x "${sessionheight}" -y "${sessionwidth}" -s "${servicename}" "${executable} ${parms}" 2> "${lgsmlogdir}/.${servicename}-tmux-error.tmp" + tmux new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${servicename}" "${executable} ${parms}" 2> "${lgsmlogdir}/.${servicename}-tmux-error.tmp" # Create logfile touch "${consolelog}" From 69199a1af1bfcfdbc751ff217c040686956653ba Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 29 Dec 2017 15:30:54 +0000 Subject: [PATCH 05/18] Revert "Tmux session size arguments out of order." --- lgsm/functions/command_start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh index 96aa7b8e4..6bad48141 100644 --- a/lgsm/functions/command_start.sh +++ b/lgsm/functions/command_start.sh @@ -98,7 +98,7 @@ fn_start_tmux(){ # Create lockfile date > "${rootdir}/${lockselfname}" cd "${executabledir}" - tmux new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${servicename}" "${executable} ${parms}" 2> "${lgsmlogdir}/.${servicename}-tmux-error.tmp" + tmux new-session -d -x "${sessionheight}" -y "${sessionwidth}" -s "${servicename}" "${executable} ${parms}" 2> "${lgsmlogdir}/.${servicename}-tmux-error.tmp" # Create logfile touch "${consolelog}" From 10d6dfb5d9723920b2fe0d8293bb95825b8832d5 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 16 Jan 2018 19:05:42 +0100 Subject: [PATCH 06/18] Updated oxide links using git api --- lgsm/functions/mods_list.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/mods_list.sh b/lgsm/functions/mods_list.sh index 47131af69..020787a1b 100644 --- a/lgsm/functions/mods_list.sh +++ b/lgsm/functions/mods_list.sh @@ -26,6 +26,10 @@ sourcemodscrapeurl="https://sm.alliedmods.net/smdrop/${sourcemodmversion}/source sourcemodlatestfile="$(wget "${sourcemodscrapeurl}" -q -O -)" sourcemoddownloadurl="https://www.sourcemod.net/latest.php?os=linux&version=${sourcemodmversion}" sourcemodurl="${sourcemoddownloadurl}" +# Oxide +oxiderustlatestlink="$(curl -s https://api.github.com/repos/OxideMod/Oxide.Rust/releases/latest | grep browser_download_url | cut -d '"' -f 4)" +oxidehurtworldlatestlink="$(curl -s https://api.github.com/repos/OxideMod/Oxide.Hurtworld/releases/latest | grep browser_download_url | cut -d '"' -f 4)" +oxidesdtdlatestlink="$(curl -s https://api.github.com/repos/OxideMod/Oxide.SevenDaysToDie/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep "Oxide.Hurtworld.zip")" # Define mods information (required) @@ -66,9 +70,9 @@ mod_info_advdupe2=( MOD "advdupe2" "Advanced Duplicator 2" "https://github.com/w mod_info_darkrp=( MOD "darkrp" "DarkRP" "https://github.com/FPtje/DarkRP/archive/master.zip" "darkrp-master.zip" "0" "LowercaseOn" "${systemdir}/gamemodes" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://darkrp.com" "Most popular gamemode" ) mod_info_darkrpmodification=( MOD "darkrpmodification" "DarkRP Modification" "https://github.com/FPtje/darkrpmodification/archive/master.zip" "darkrpmodification-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "NOUPDATE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://darkrp.com" "Customize DarkRP settings" ) # Oxidemod -mod_info_rustoxide=( MOD "rustoxide" "Oxide for Rust" "https://github.com/OxideMod/Oxide/releases/download/latest/Oxide-Rust.zip" "Oxide-Rust.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Rust;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-rust.1659/" "Allows for the use of plugins" ) -mod_info_hwoxide=( MOD "hwoxide" "Oxide for Hurtworld" "https://github.com/OxideMod/Oxide/releases/download/latest/Oxide-Hurtworld.zip" "Oxide-Hurtworld.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Hurtworld;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-hurtworld.1332/" "Allows for the use of plugins" ) -mod_info_sdtdoxide=( MOD "sdtdoxide" "Oxide for 7 Days To Die" "https://github.com/OxideMod/Oxide/releases/download/latest/Oxide-SevenDaysToDie.zip" "Oxide-SevenDaysToDie.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "7 Days To Die;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-7-days-to-die.813/" "Allows for the use of plugins" ) +mod_info_rustoxide=( MOD "rustoxide" "Oxide for Rust" "${oxiderustlatestlink}" "Oxide.Rust.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Rust;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-rust.1659/" "Allows for the use of plugins" ) +mod_info_hwoxide=( MOD "hwoxide" "Oxide for Hurtworld" "${oxidehurtworldlatestlink}" "Oxide.Hurtworld.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Hurtworld;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-hurtworld.1332/" "Allows for the use of plugins" ) +mod_info_sdtdoxide=( MOD "sdtdoxide" "Oxide for 7 Days To Die" "${oxidesdtdlatestlink}" "Oxide.SevenDaysToDie.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "7 Days To Die;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-7-days-to-die.813/" "Allows for the use of plugins" ) # REQUIRED: Set all mods info into the global array mods_global_array=( "${mod_info_metamod[@]}" "${mod_info_sourcemod[@]}" "${mod_info_ulib[@]}" "${mod_info_ulx[@]}" "${mod_info_utime[@]}" "${mod_info_uclip[@]}" "${mod_info_acf[@]}" "${mod_info_acf_missiles[@]}" "${mod_info_acf_sweps[@]}" "${mod_info_advdupe2[@]}" "${mod_info_darkrp[@]}" "${mod_info_darkrpmodification[@]}" "${mod_info_rustoxide[@]}" "${mod_info_hwoxide[@]}" "${mod_info_sdtdoxide[@]}" ) From 3d6a92907ddd65fedfcd0e93a0b44122db21e010 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 17 Jan 2018 23:04:44 +0000 Subject: [PATCH 07/18] updated travis --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb258edce..c52f1af36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: bash +dist: trusty sudo: required -env: -- DISTRO=ubuntu-trusty before_script: - curl -L "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/shunit2/shunit2-2.1.6.tgz" | tar zx From 1ede93357e45d6fe504364ceee222a082e4eb033 Mon Sep 17 00:00:00 2001 From: CedarLUG <19336442+cedarlug@users.noreply.github.com> Date: Tue, 23 Jan 2018 11:18:31 -0600 Subject: [PATCH 08/18] Added error handling and commentary --- lgsm/functions/command_backup.sh | 35 ++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index ea9647c4d..95a677b33 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -113,8 +113,15 @@ fn_backup_compression(){ fn_print_dots "Backup (${rootdirduexbackup}) ${backupname}.tar.gz, in progress..." fn_script_log_info "backup ${rootdirduexbackup} ${backupname}.tar.gz, in progress" excludedir=$(fn_backup_relpath) - # CHECK THAT excludedir isn't empty. Sanity check here -CedarLUG - tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "${excludedir}" ./* + + # CHECK THAT excludedir is a valid path. + if [ ! -d "${excludedir}" ] ; then + fn_print_info_nl "Problem identifying the previous backup directory for exclusion." + fn_script_log_error "Problem identifying the previous backup directory for exclusion" + core_exit.sh + fi + + tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "${excludedir}" --exclude "${tmpdir}/.backup.lock" ./* local exitcode=$? if [ ${exitcode} -ne 0 ]; then fn_print_fail_eol @@ -183,26 +190,46 @@ fn_backup_prune(){ fn_backup_relpath() { # Written by CedarLUG as a "realpath --relative-to" alternative in bash + + # Populate an array of tokens initialized from the rootdir components: declare -a rdirtoks=($(readlink -f "${rootdir}" | sed "s/\// /g")) - # CHECK THAT the array is populated correctly. Sanity check here -CedarLUG + + if [ ${#rdirtoks[@]} -eq 0 ]; then + fn_print_info_nl "Problem assessing rootdir during relative path assessment" + fn_script_log_error "Problem assessing rootdir during relative path assessment: ${rootdir}" + core_exit.sh + fi + + # Populate an array of tokens initialized from the backupdir components: declare -a bdirtoks=($(readlink -f "${backupdir}" | sed "s/\// /g")) - # CHECK THAT the array is populated correctly. Sanity check here -CedarLUG + if [ ${#bdirtoks[@]} -eq 0 ]; then + fn_print_info_nl "Problem assessing backupdir during relative path assessment" + fn_script_log_error "Problem assessing backupdir during relative path assessment: ${rootdir}" + core_exit.sh + fi + # Compare the leading entries of each array. These common elements will be clipped off + # for the relative path output. for ((base=0; $base<${#rdirtoks[@]}; base++)) do [[ "${rdirtoks[$base]}" != "${bdirtoks[$base]}" ]] && break done + # Next, climb out of the remaining rootdir location with updir references... for ((x=${base};$x<${#rdirtoks[@]};x++)) do echo -n "../" done + # Climb down the remaining components of the backupdir location. for ((x=${base};$x<$(( ${#bdirtoks[@]} - 1 ));x++)) do echo -n "${bdirtoks[$x]}/" done + # In the event there were no directories left in the backupdir above to + # traverse down, just add a newline. Otherwise at this point, there is + # one remaining directory component in the backupdir to navigate. if (( "$base" < "${#bdirtoks[@]}" )) ; then echo ${bdirtoks[ $(( ${#bdirtoks[@]} - 1)) ]} else From 6667a86de71291b364178233b4fa5fd479ef6533 Mon Sep 17 00:00:00 2001 From: CedarLUG <19336442+cedarlug@users.noreply.github.com> Date: Tue, 23 Jan 2018 11:54:31 -0600 Subject: [PATCH 09/18] Cleanup of various things identified by shellcheck --- lgsm/functions/command_backup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 95a677b33..80e81a191 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -210,19 +210,19 @@ fn_backup_relpath() { # Compare the leading entries of each array. These common elements will be clipped off # for the relative path output. - for ((base=0; $base<${#rdirtoks[@]}; base++)) + for ((base=0; base<${#rdirtoks[@]}; base++)) do [[ "${rdirtoks[$base]}" != "${bdirtoks[$base]}" ]] && break done # Next, climb out of the remaining rootdir location with updir references... - for ((x=${base};$x<${#rdirtoks[@]};x++)) + for ((x=base;x<${#rdirtoks[@]};x++)) do echo -n "../" done # Climb down the remaining components of the backupdir location. - for ((x=${base};$x<$(( ${#bdirtoks[@]} - 1 ));x++)) + for ((x=base;x<$(( ${#bdirtoks[@]} - 1 ));x++)) do echo -n "${bdirtoks[$x]}/" done @@ -231,7 +231,7 @@ fn_backup_relpath() { # traverse down, just add a newline. Otherwise at this point, there is # one remaining directory component in the backupdir to navigate. if (( "$base" < "${#bdirtoks[@]}" )) ; then - echo ${bdirtoks[ $(( ${#bdirtoks[@]} - 1)) ]} + echo "${bdirtoks[ $(( ${#bdirtoks[@]} - 1)) ]}" else echo fi From 846949b2d98edcdcfea1ccc7407b0d0f8edbc819 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 26 Jan 2018 22:06:37 +0100 Subject: [PATCH 10/18] Put Oxide for hurtworld grep at right location Fixes #1789 --- lgsm/functions/mods_list.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/mods_list.sh b/lgsm/functions/mods_list.sh index 020787a1b..5852117eb 100644 --- a/lgsm/functions/mods_list.sh +++ b/lgsm/functions/mods_list.sh @@ -28,8 +28,8 @@ sourcemoddownloadurl="https://www.sourcemod.net/latest.php?os=linux&version=${so sourcemodurl="${sourcemoddownloadurl}" # Oxide oxiderustlatestlink="$(curl -s https://api.github.com/repos/OxideMod/Oxide.Rust/releases/latest | grep browser_download_url | cut -d '"' -f 4)" -oxidehurtworldlatestlink="$(curl -s https://api.github.com/repos/OxideMod/Oxide.Hurtworld/releases/latest | grep browser_download_url | cut -d '"' -f 4)" -oxidesdtdlatestlink="$(curl -s https://api.github.com/repos/OxideMod/Oxide.SevenDaysToDie/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep "Oxide.Hurtworld.zip")" +oxidehurtworldlatestlink="$(curl -s https://api.github.com/repos/OxideMod/Oxide.Hurtworld/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep "Oxide.Hurtworld.zip")" +oxidesdtdlatestlink="$(curl -s https://api.github.com/repos/OxideMod/Oxide.SevenDaysToDie/releases/latest | grep browser_download_url | cut -d '"' -f 4)" # Define mods information (required) From 7889c6df2e4da75157395c3449f4a545bc5ce765 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 20 Feb 2018 22:29:19 +0100 Subject: [PATCH 11/18] accepting license by default --- lgsm/functions/install_ts3db.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh index c2bda5850..79eb97013 100644 --- a/lgsm/functions/install_ts3db.sh +++ b/lgsm/functions/install_ts3db.sh @@ -63,6 +63,6 @@ sleep 1 echo "IMPORANT! Save these details for later." sleep 1 cd "${executabledir}" -./ts3server_startscript.sh start inifile=ts3-server.ini +./ts3server_startscript.sh start inifile=ts3-server.ini license_accepted=1 sleep 5 ./ts3server_startscript.sh stop From f45e765b1c6b39c1956d110403b19be9717139e8 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 20 Feb 2018 22:39:46 +0100 Subject: [PATCH 12/18] Added ts3 license --- lgsm/functions/command_start.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh index 6bad48141..eae0d2a11 100644 --- a/lgsm/functions/command_start.sh +++ b/lgsm/functions/command_start.sh @@ -38,6 +38,14 @@ fn_start_teamspeak3(){ fi # Create lockfile date > "${rootdir}/${lockselfname}" + # Accept license + if [ ! -f "${executabledir}/.ts3server_license_accepted" ]; then + fn_script_log "Creating License acceptation file, which means you accept TeamSpeak License if you keep using it" + fn_print_info_nl "Creating License acceptation file, which means you accept TeamSpeak License if you keep using it" + fn_print_info_nl " * You can review the TeamSpeak License in ${executabledir}/LICENSE" + sleep 3 + touch "${executabledir}/.ts3server_license_accepted" + fi cd "${executabledir}" if [ "${ts3serverpass}" == "1" ]; then ./ts3server_startscript.sh start serveradmin_password="${newpassword}" inifile="${servercfgfullpath}" > /dev/null 2>&1 From 1074ab064eac2dfe97ad1e097ea3688a32e91858 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 23 Feb 2018 19:19:18 +0100 Subject: [PATCH 13/18] New fix for Rust Fixes #1817 #1813 Tested Working on Debian 9; cannot be worst than nothing for other distro. --- lgsm/functions/fix_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/fix_rust.sh b/lgsm/functions/fix_rust.sh index 13f7fbdb0..ea41a65f9 100644 --- a/lgsm/functions/fix_rust.sh +++ b/lgsm/functions/fix_rust.sh @@ -8,4 +8,4 @@ local commandname="FIX" local commandaction="Fix" # Fixes: [Raknet] Server Shutting Down (Shutting Down) -export LD_LIBRARY_PATH="${systemdir}/RustDedicated_Data/Plugins/x86_64" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${systemdir}/RustDedicated_Data/Plugins/x86_64" From 658876e6d728007d6466eff396739dc7020f888a Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 27 Feb 2018 00:51:39 +0100 Subject: [PATCH 14/18] touch method for accepting license --- lgsm/functions/install_ts3db.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh index 79eb97013..eeb136382 100644 --- a/lgsm/functions/install_ts3db.sh +++ b/lgsm/functions/install_ts3db.sh @@ -62,7 +62,14 @@ echo "=================================" sleep 1 echo "IMPORANT! Save these details for later." sleep 1 +if [ ! -f "${executabledir}/.ts3server_license_accepted" ]; then + fn_script_log "Accepting ts3server license: ${executabledir}/LICENSE" + fn_print_info_nl "Accepting TeamSpeak license" + fn_print_info_nl " * You can review the TeamSpeak License in ${executabledir}/LICENSE" + sleep 3 + touch "${executabledir}/.ts3server_license_accepted" +fi cd "${executabledir}" -./ts3server_startscript.sh start inifile=ts3-server.ini license_accepted=1 +./ts3server_startscript.sh start inifile=ts3-server.ini sleep 5 ./ts3server_startscript.sh stop From ec82ffff413de240f3306f9566288070b57728e4 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 27 Feb 2018 01:08:19 +0100 Subject: [PATCH 15/18] can't touch this --- lgsm/functions/install_ts3db.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh index eeb136382..66edb34e5 100644 --- a/lgsm/functions/install_ts3db.sh +++ b/lgsm/functions/install_ts3db.sh @@ -55,6 +55,13 @@ else fn_print_warning_nl "./${selfname} auto-install is uses sqlite. For MariaDB/MySQL use ./${selfname} install" fi +## License +fn_script_log "Accepting ts3server license: ${executabledir}/LICENSE" +fn_print_info_nl "Accepting TeamSpeak license:" +fn_print_info_nl " * ${executabledir}/LICENSE" +sleep 3 +touch "${executabledir}/.ts3server_license_accepted" + ## Get privilege key echo "" echo "Getting privilege key" @@ -62,13 +69,6 @@ echo "=================================" sleep 1 echo "IMPORANT! Save these details for later." sleep 1 -if [ ! -f "${executabledir}/.ts3server_license_accepted" ]; then - fn_script_log "Accepting ts3server license: ${executabledir}/LICENSE" - fn_print_info_nl "Accepting TeamSpeak license" - fn_print_info_nl " * You can review the TeamSpeak License in ${executabledir}/LICENSE" - sleep 3 - touch "${executabledir}/.ts3server_license_accepted" -fi cd "${executabledir}" ./ts3server_startscript.sh start inifile=ts3-server.ini sleep 5 From 8dd06e59f63af3f93e1c5532e18672d8cd71f12d Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 27 Feb 2018 01:09:08 +0100 Subject: [PATCH 16/18] Better way to say it --- lgsm/functions/command_start.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh index eae0d2a11..2cccfa271 100644 --- a/lgsm/functions/command_start.sh +++ b/lgsm/functions/command_start.sh @@ -40,9 +40,9 @@ fn_start_teamspeak3(){ date > "${rootdir}/${lockselfname}" # Accept license if [ ! -f "${executabledir}/.ts3server_license_accepted" ]; then - fn_script_log "Creating License acceptation file, which means you accept TeamSpeak License if you keep using it" - fn_print_info_nl "Creating License acceptation file, which means you accept TeamSpeak License if you keep using it" - fn_print_info_nl " * You can review the TeamSpeak License in ${executabledir}/LICENSE" + fn_script_log "Accepting ts3server license: ${executabledir}/LICENSE" + fn_print_info_nl "Accepting TeamSpeak license:" + fn_print_info_nl " * ${executabledir}/LICENSE" sleep 3 touch "${executabledir}/.ts3server_license_accepted" fi From f5e72e4af50a7c866393c036e6eb6c75719b2fa5 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 27 Feb 2018 01:33:57 +0100 Subject: [PATCH 17/18] sdtd doesn't need steam login anymore --- lgsm/config-default/config-lgsm/sdtdserver/_default.cfg | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg b/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg index 93b36fb78..ca26f1c7e 100644 --- a/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg @@ -8,10 +8,6 @@ #### Server Settings #### -## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login -steamuser="username" -steampass='password' - ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters ip="0.0.0.0" From 31e3df872c3269e0d24651a23118ee9a8acddd64 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 10 Mar 2018 22:47:35 +0000 Subject: [PATCH 18/18] Updated Readme.md --- README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 88dbbe801..12111a15d 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,13 @@ -linux Game Server Managers +linux Game Server Managers [![LinuxGSM](https://github.com/GameServerManagers/LinuxGSM/blob/master/images/logo/lgsmbutton.png)](https://linuxgsm.com) [![Build Status](https://travis-ci.org/GameServerManagers/LinuxGSM.svg?branch=master)](https://travis-ci.org/GameServerManagers/LinuxGSM) [![Under Development](https://badge.waffle.io/GameServerManagers/LinuxGSM.svg?label=Under%20Development&title=Under%20Development)](http://waffle.io/GameServerManagers/LinuxGSM) -[![Discord](https://discordapp.com/api/guilds/127498813903601664/widget.png?style=shield)](https://gameservermanagers.com/discord) +[![Discord](https://discordapp.com/api/guilds/127498813903601664/widget.png?style=shield)](https://linuxgsm.com/discord) +[![MIT Licence](https://badges.frapsoft.com/os/mit/mit.svg?v=103)](https://github.com/GameServerManagers/LinuxGSM/blob/master/LICENSE) +[![made-with-bash](https://img.shields.io/badge/-Made%20with%20Bash-1f425f.svg?logo=image%2Fpng%3Bbase64%2CiVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw%2FeHBhY2tldCBiZWdpbj0i77u%2FIiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8%2BIDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTExIDc5LjE1ODMyNSwgMjAxNS8wOS8xMC0wMToxMDoyMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE3MDg2QTAyQUZCMzExRTVBMkQxRDMzMkJDMUQ4RDk3IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE3MDg2QTAzQUZCMzExRTVBMkQxRDMzMkJDMUQ4RDk3Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QTcwODZBMDBBRkIzMTFFNUEyRDFEMzMyQkMxRDhEOTciIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QTcwODZBMDFBRkIzMTFFNUEyRDFEMzMyQkMxRDhEOTciLz4gPC9yZGY6RGVzY3JpcHRpb24%2BIDwvcmRmOlJERj4gPC94OnhtcG1ldGE%2BIDw%2FeHBhY2tldCBlbmQ9InIiPz6lm45hAAADkklEQVR42qyVa0yTVxzGn7d9Wy03MS2ii8s%2BeokYNQSVhCzOjXZOFNF4jx%2BMRmPUMEUEqVG36jo2thizLSQSMd4N8ZoQ8RKjJtooaCpK6ZoCtRXKpRempbTv5ey83bhkAUphz8fznvP8znn%2B%2F3NeEEJgNBoRRSmz0ub%2FfuxEacBg%2FDmYtiCjgo5NG2mBXq%2BH5I1ogMRk9Zbd%2BQU2e1ML6VPLOyf5tvBQ8yT1lG10imxsABm7SLs898GTpyYynEzP60hO3trHDKvMigUwdeaceacqzp7nOI4n0SSIIjl36ao4Z356OV07fSQAk6xJ3XGg%2BLCr1d1OYlVHp4eUHPnerU79ZA%2F1kuv1JQMAg%2BE4O2P23EumF3VkvHprsZKMzKwbRUXFEyTvSIEmTVbrysp%2BWr8wfQHGK6WChVa3bKUmdWou%2BjpArdGkzZ41c1zG%2Fu5uGH4swzd561F%2BuhIT4%2BLnSuPsv9%2BJKIpjNr9dXYOyk7%2FBZrcjIT4eCnoKgedJP4BEqhG77E3NKP31FO7cfQA5K0dSYuLgz2TwCWJSOBzG6crzKK%2BohNfni%2Bx6OMUMMNe%2Fgf7ocbw0v0acKg6J8Ql0q%2BT%2FAXR5PNi5dz9c71upuQqCKFAD%2BYhrZLEAmpodaHO3Qy6TI3NhBpbrshGtOWKOSMYwYGQM8nJzoFJNxP2HjyIQho4PewK6hBktoDcUwtIln4PjOWzflQ%2Be5yl0yCCYgYikTclGlxadio%2BBQCSiW1UXoVGrKYwH4RgMrjU1HAB4vR6LzWYfFUCKxfS8Ftk5qxHoCUQAUkRJaSEokkV6Y%2F%2BJUOC4hn6A39NVXVBYeNP8piH6HeA4fPbpdBQV5KOx0QaL1YppX3Jgk0TwH2Vg6S3u%2BdB91%2B%2FpuNYPYFl5uP5V7ZqvsrX7jxqMXR6ff3gCQSTzFI0a1TX3wIs8ul%2Bq4HuWAAiM39vhOuR1O1fQ2gT%2F26Z8Z5vrl2OHi9OXZn995nLV9aFfS6UC9JeJPfuK0NBohWpCHMSAAsFe74WWP%2BvT25wtP9Bpob6uGqqyDnOtaeumjRu%2ByFu36VntK%2FPA5umTJeUtPWZSU9BCgud661odVp3DZtkc7AnYR33RRC708PrVi1larW7XwZIjLnd7R6SgSqWSNjU1B3F72pz5TZbXmX5vV81Yb7Lg7XT%2FUXriu8XLVqw6c6XqWnBKiiYU%2BMt3wWF7u7i91XlSEITwSAZ%2FCzAAHsJVbwXYFFEAAAAASUVORK5CYII%3D)](https://www.gnu.org/software/bash/) -LinuxGSM is the command line tool for quick, simple deployment and management of dedicated game servers. +LinuxGSM is the command line tool for quick, simple deployment and management of dedicated game servers.

Hassle-Free Dedicated Servers

Game servers traditionally are not easy to manage yourself. Admins often have to spend hours just messing around trying to get their server working. LinuxGSM is designed to be a simple as possible allowing admins to spend less time on management and more time gaming. @@ -40,11 +42,11 @@ All FAQ can be found here.

Donate

If you want to donate to the project you can via PayPal. I have had a may kind people show their support by sending me a donation. Any donations you send help cover my server costs and buy me a drink. Cheers!

Useful Links