From f5496c72f65bc11f0a961300511f51efe536a0da Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 8 Oct 2023 23:33:20 +0100 Subject: [PATCH 1/4] update package.json --- .prettierrc | 2 +- package-lock.json | 246 ++++------------------------------------------ package.json | 4 +- 3 files changed, 24 insertions(+), 228 deletions(-) diff --git a/.prettierrc b/.prettierrc index 02d542d50..1902f8021 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,3 +1,3 @@ { - "plugins": ["prettier-plugin-sh"] + "plugins": ["prettier-plugin-sh"] } diff --git a/package-lock.json b/package-lock.json index 8532248e0..669e4f59d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,274 +7,70 @@ "name": "linuxgsm", "license": "MIT", "devDependencies": { - "prettier": "^2.8.8", - "prettier-plugin-sh": "^0.12.8" + "prettier": "^3.0.3", + "prettier-plugin-sh": "^0.13.1" } }, - "node_modules/@pkgr/utils": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.3.1.tgz", - "integrity": "sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.3", - "is-glob": "^4.0.3", - "open": "^8.4.0", - "picocolors": "^1.0.0", - "tiny-glob": "^0.2.9", - "tslib": "^2.4.0" - }, - "engines": { - "node": "^12.20.0 || ^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/unts" - } - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/define-lazy-prop": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", - "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/globalyzer": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz", - "integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==", - "dev": true - }, - "node_modules/globrex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", - "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==", - "dev": true - }, - "node_modules/is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "dev": true, - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "dev": true, - "dependencies": { - "is-docker": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, "node_modules/mvdan-sh": { "version": "0.10.1", "resolved": "https://registry.npmjs.org/mvdan-sh/-/mvdan-sh-0.10.1.tgz", "integrity": "sha512-kMbrH0EObaKmK3nVRKUIIya1dpASHIEusM13S4V1ViHFuxuNxCo+arxoa6j/dbV22YBGjl7UKJm9QQKJ2Crzhg==", "dev": true }, - "node_modules/open": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", - "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", - "dev": true, - "dependencies": { - "define-lazy-prop": "^2.0.0", - "is-docker": "^2.1.1", - "is-wsl": "^2.2.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true - }, "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" } }, "node_modules/prettier-plugin-sh": { - "version": "0.12.8", - "resolved": "https://registry.npmjs.org/prettier-plugin-sh/-/prettier-plugin-sh-0.12.8.tgz", - "integrity": "sha512-VOq8h2Gn5UzrCIKm4p/nAScXJbN09HdyFDknAcxt6Qu/tv/juu9bahxSrcnM9XWYA+Spz1F1ANJ4LhfwB7+Q1Q==", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/prettier-plugin-sh/-/prettier-plugin-sh-0.13.1.tgz", + "integrity": "sha512-ytMcl1qK4s4BOFGvsc9b0+k9dYECal7U29bL/ke08FEUsF/JLN0j6Peo0wUkFDG4y2UHLMhvpyd6Sd3zDXe/eg==", "dev": true, "dependencies": { "mvdan-sh": "^0.10.1", - "sh-syntax": "^0.3.6", - "synckit": "^0.8.1" + "sh-syntax": "^0.4.1" }, "engines": { - "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + "node": ">=16.0.0" }, "funding": { "url": "https://opencollective.com/unts" }, "peerDependencies": { - "prettier": "^2.0.0" + "prettier": "^3.0.0" } }, "node_modules/sh-syntax": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/sh-syntax/-/sh-syntax-0.3.7.tgz", - "integrity": "sha512-xIB/uRniZ9urxAuXp1Ouh/BKSI1VK8RSqfwGj7cV57HvGrFo3vHdJfv8Tdp/cVcxJgXQTkmHr5mG5rqJW8r4wQ==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/sh-syntax/-/sh-syntax-0.4.1.tgz", + "integrity": "sha512-MW/ZsCYTu11EIYYTSZcfAgMFszAodCmQVB27XssHoIN6L4EG0KSA3h32x8whaSOKuYBX5wz9EybfnPBUFQMCKA==", "dev": true, "dependencies": { - "tslib": "^2.4.0" + "tslib": "^2.6.0" }, "engines": { - "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + "node": ">=16.0.0" }, "funding": { "url": "https://opencollective.com/unts" } }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/synckit": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz", - "integrity": "sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==", - "dev": true, - "dependencies": { - "@pkgr/utils": "^2.3.1", - "tslib": "^2.5.0" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/unts" - } - }, - "node_modules/tiny-glob": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz", - "integrity": "sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==", - "dev": true, - "dependencies": { - "globalyzer": "0.1.0", - "globrex": "^0.1.2" - } - }, "node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", "dev": true - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } } } } diff --git a/package.json b/package.json index f3d3df0fd..89bb70244 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "test": "tests" }, "devDependencies": { - "prettier": "^2.8.8", - "prettier-plugin-sh": "^0.12.8" + "prettier": "^3.0.3", + "prettier-plugin-sh": "^0.13.1" }, "scripts": { "test": "echo \"Error: no test specified\" && exit 1" From 3259981e616353216fff2c8caa18c299ac052400 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 10 Oct 2023 20:19:53 +0100 Subject: [PATCH 2/4] refactor: remove unused tests - Removed the following files: - `tests/tests_defaultcfg/defaultcfg_0.txt` - `tests/tests_defaultcfg/defaultcfg_1.txt` - `tests/tests_defaultcfg/tests_defaultcfg.sh` - `tests/tests_fctrserver.sh` These files were no longer needed and have been deleted. refactor: remove unused code - Removed the following files: - `tests/tests_defaultcfg/defaultcfg_0.txt` - `tests/tests_defaultcfg/defaultcfg_1.txt` - `tests/tests_defaultcfg/tests_defaultcfg.sh` - `tests/tests_fctrserver.sh` These files were no longer needed and have been deleted. --- tests/tests_defaultcfg/defaultcfg_0.txt | 63 - tests/tests_defaultcfg/defaultcfg_1.txt | 53 - tests/tests_defaultcfg/tests_defaultcfg.sh | 65 - tests/tests_fctrserver.sh | 1186 ----------------- tests/tests_jc2server.sh | 1352 -------------------- tests/tests_mcserver.sh | 1231 ------------------ tests/tests_ts3server.sh | 1184 ----------------- 7 files changed, 5134 deletions(-) delete mode 100644 tests/tests_defaultcfg/defaultcfg_0.txt delete mode 100644 tests/tests_defaultcfg/defaultcfg_1.txt delete mode 100644 tests/tests_defaultcfg/tests_defaultcfg.sh delete mode 100644 tests/tests_fctrserver.sh delete mode 100644 tests/tests_jc2server.sh delete mode 100644 tests/tests_mcserver.sh delete mode 100644 tests/tests_ts3server.sh diff --git a/tests/tests_defaultcfg/defaultcfg_0.txt b/tests/tests_defaultcfg/defaultcfg_0.txt deleted file mode 100644 index bcaa9f1dd..000000000 --- a/tests/tests_defaultcfg/defaultcfg_0.txt +++ /dev/null @@ -1,63 +0,0 @@ -stats -displayip -postalert -discordalert -discordwebhook -emailalert -email -emailfrom -iftttalert -ifttttoken -iftttevent -mailgunalert -mailguntoken -mailgundomain -mailgunemailfrom -mailgunemail -pushbulletalert -pushbullettoken -channeltag -rocketchatalert -rocketchatwebhook -rocketchattoken -slackalert -slackwebhook -pushoveralert -pushovertoken -telegramalert -telegramtoken -telegramchatid -curlcustomstring -maxbackups -maxbackupdays -stoponbackup -consolelogging -logdays -querydelay -ansi -sleeptime -stopmode -querymode -querytype -consoleverbose -consoleinteract -gamename -engine -glibc -systemdir -executabledir -executable -servercfgdir -servercfg -servercfgdefault -servercfgfullpath -backupdir -logdir -lgsmlogdir -consolelogdir -lgsmlog -consolelog -alertlog -postdetailslog -lgsmlogdate -consolelogdate diff --git a/tests/tests_defaultcfg/defaultcfg_1.txt b/tests/tests_defaultcfg/defaultcfg_1.txt deleted file mode 100644 index 63b888f9d..000000000 --- a/tests/tests_defaultcfg/defaultcfg_1.txt +++ /dev/null @@ -1,53 +0,0 @@ -################################## -######## Default Settings ######## -################################## -# DO NOT EDIT, ANY CHANGES WILL BE OVERWRITTEN! -# Copy settings from here and use them in either: -# common.cfg - applies settings to every instance. -# [instance].cfg - applies settings to a specific instance. -#### Game Server Settings #### -## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters -#### LinuxGSM Settings #### -## Notification Alerts -# (on|off) -# Display IP | https://docs.linuxgsm.com/alerts#display-ip -# More info | https://docs.linuxgsm.com/alerts#more-info -# Discord Alerts | https://docs.linuxgsm.com/alerts/discord -# Email Alerts | https://docs.linuxgsm.com/alerts/email -# IFTTT Alerts | https://docs.linuxgsm.com/alerts/ifttt -# Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet -# Pushover Alerts | https://docs.linuxgsm.com/alerts/pushover -# Slack Alerts | https://docs.linuxgsm.com/alerts/slack -# Telegram Alerts | https://docs.linuxgsm.com/alerts/telegram -# You can add a custom cURL string eg proxy (useful in Russia) in "curlcustomstring". -# For example "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help". -## Backup | https://docs.linuxgsm.com/commands/backup -## Logging | https://docs.linuxgsm.com/features/logging -## Monitor | https://docs.linuxgsm.com/commands/monitor -# Query delay time -## ANSI Colors | https://docs.linuxgsm.com/features/ansi-colors -#### Advanced Settings #### -## Message Display Time | https://docs.linuxgsm.com/features/message-display-time -## Stop Mode | https://docs.linuxgsm.com/features/stop-mode -# 1: tmux kill -# 2: CTRL+c -# 3: quit -# 4: quit 120s -# 5: stop -# 6: q -# 7: exit -# 8: 7 Days to Die -# 9: GoldSrc -# 10: Avorion -# 11: end -## Console type -consoleverbose="" -consoleinteract="" -## Game Server Details -# Do not edit -#### Directories #### -# Edit with care -## Game Server Directories -## Backup Directory -## Logging Directories -## Logs Naming diff --git a/tests/tests_defaultcfg/tests_defaultcfg.sh b/tests/tests_defaultcfg/tests_defaultcfg.sh deleted file mode 100644 index 5f97f9a33..000000000 --- a/tests/tests_defaultcfg/tests_defaultcfg.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -echo -e "" -echo -e "0.1 - Full comparison Output" -echo -e "==================================================================" -echo -e "Description:" -echo -e "test checks that vars present in ALL _default.cfg files are correct." -echo -e "" -echo -e "In master config < | > In game config" -find "lgsm/config-default/config-lgsm/" ! -name '*template.cfg' -name "*.cfg" -type f -print0 \ - | while IFS= read -r -d $'\0' line; do - grep "=" "${line}" | cut -f1 -d"=" > defaultcfgtemp.txt - diffoutput=$(diff tests/tests_defaultcfg/defaultcfg_0.txt defaultcfgtemp.txt) - if [ "${diffoutput}" ]; then - echo "File with errors:" - echo "${line}" - echo -e "=================================" - echo -e "In master config < | > In game config" - echo "${diffoutput}" - echo "" - fi - rm -f defaultcfgtemp.txt - done - -echo -e "" -echo -e "1.0 - Master Comparison" -echo -e "==================================================================" -echo -e "Description:" -echo -e "test checks that vars present in ALL _default.cfg files are correct." -echo -e "" -echo -e "In master config < | > In game config" -find lgsm/config-default/config-lgsm/ ! -name '*template.cfg' -name "*.cfg" -type f -print0 \ - | while IFS= read -r -d $'\0' line; do - grep "=" "${line}" | cut -f1 -d"=" > defaultcfgtemp.txt - diffoutput=$(diff tests/tests_defaultcfg/defaultcfg_0.txt defaultcfgtemp.txt | grep '^<') - if [ "${diffoutput}" ]; then - echo "File with errors:" - echo "${line}" - echo -e "=================================" - echo -e "In master config < | > In game config" - echo "${diffoutput}" - echo "" - fi - rm -f defaultcfgtemp.txt - done - -echo -e "" -echo -e "2.0 - Check Comment" -echo -e "==================================================================" -echo -e "Description:" -echo -e "test checks that comments in ALL _default.cfg files are correct." -echo -e "" -echo -e "In master config < | > In game config" -find lgsm/config-default/config-lgsm/ ! -name '*template.cfg' -name "*.cfg" -type f -print0 \ - | while IFS= read -r -d $'\0' line; do - grep "#" "${line}" > defaultcfgtemp.txt - diffoutput=$(diff tests/tests_defaultcfg/defaultcfg_1.txt defaultcfgtemp.txt | grep '^<') - if [ "${diffoutput}" ]; then - echo "File with errors:" - echo "${line}" - echo -e "=================================" - echo "${diffoutput}" - echo "" - fi - rm -f defaultcfgtemp.txt - done diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh deleted file mode 100644 index 0b4530d87..000000000 --- a/tests/tests_fctrserver.sh +++ /dev/null @@ -1,1186 +0,0 @@ -#!/bin/bash -# Project: Game Server Managers - LinuxGSM -# Author: Daniel Gibbs -# License: MIT License, Copyright (c) 2020 Daniel Gibbs -# Purpose: Travis CI Tests: Factorio | Linux Game Server Management Script -# Contributors: https://linuxgsm.com/contrib -# Documentation: https://docs.linuxgsm.com -# Website: https://linuxgsm.com - -# DO NOT EDIT THIS FILE -# LinuxGSM configuration is no longer edited here -# To update your LinuxGSM config go to: -# lgsm/config-lgsm -# https://docs.linuxgsm.com/configuration/linuxgsm-config - -# Debugging -if [ -f ".dev-debug" ]; then - exec 5> dev-debug.log - BASH_XTRACEFD="5" - set -x -fi - -version="v23.5.3" -shortname="fctr" -gameservername="fctrserver" -commandname="CORE" -rootdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") -selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")") -sessionname=$(echo "${selfname}" | cut -f1 -d".") -lgsmdir="${rootdir}/lgsm" -logdir="${rootdir}/log" -lgsmlogdir="${logdir}/lgsm" -steamcmddir="${HOME}/.steam/steamcmd" -serverfiles="${rootdir}/serverfiles" -modulesdir="${lgsmdir}/modules" -tmpdir="${lgsmdir}/tmp" -datadir="${lgsmdir}/data" -lockdir="${lgsmdir}/lock" -serverlist="${datadir}/serverlist.csv" -serverlistmenu="${datadir}/serverlistmenu.csv" -configdir="${lgsmdir}/config-lgsm" -configdirserver="${configdir}/${gameservername}" -configdirdefault="${lgsmdir}/config-default" -userinput="${1}" - -# Allows for testing not on Travis CI. -# if using travis for tests -if [ -z "${TRAVIS}" ]; then - TRAVIS_BRANCH="develop" - TRAVIS_BUILD_DIR="${rootdir}" -fi -travistest="1" -## GitHub Branch Select -# Allows for the use of different module files -# from a different repo and/or branch. -githubuser="GameServerManagers" -githubrepo="LinuxGSM" -githubbranch="${TRAVIS_BRANCH}" - -# Core module that is required first. -core_modules.sh() { - modulefile="${FUNCNAME[0]}" - fn_bootstrap_fetch_file_github "lgsm/modules" "core_modules.sh" "${modulesdir}" "chmodx" "run" "noforcedl" "nohash" -} - -# Bootstrap -# Fetches the core modules required before passed off to core_dl.sh. -fn_bootstrap_fetch_file() { - remote_fileurl="${1}" - remote_fileurl_backup="${2}" - remote_fileurl_name="${3}" - remote_fileurl_backup_name="${4}" - local_filedir="${5}" - local_filename="${6}" - chmodx="${7:-0}" - run="${8:-0}" - forcedl="${9:-0}" - md5="${10:-0}" - # Download file if missing or download forced. - if [ ! -f "${local_filedir}/${local_filename}" ] || [ "${forcedl}" == "forcedl" ]; then - # If backup fileurl exists include it. - if [ -n "${remote_fileurl_backup}" ]; then - # counter set to 0 to allow second try - counter=0 - remote_fileurls_array=(remote_fileurl remote_fileurl_backup) - else - # counter set to 1 to not allow second try - counter=1 - remote_fileurls_array=(remote_fileurl) - fi - - for remote_fileurl_array in "${remote_fileurls_array[@]}"; do - if [ "${remote_fileurl_array}" == "remote_fileurl" ]; then - fileurl="${remote_fileurl}" - fileurl_name="${remote_fileurl_name}" - elif [ "${remote_fileurl_array}" == "remote_fileurl_backup" ]; then - fileurl="${remote_fileurl_backup}" - fileurl_name="${remote_fileurl_backup_name}" - fi - counter=$((counter + 1)) - if [ ! -d "${local_filedir}" ]; then - mkdir -p "${local_filedir}" - fi - # Trap will remove part downloaded files if canceled. - trap fn_fetch_trap INT - # Larger files show a progress bar. - - echo -en "fetching ${fileurl_name} ${local_filename}...\c" - curlcmd=$(curl -s --fail -L -o "${local_filedir}/${local_filename}" "${fileurl}" 2>&1) - - local exitcode=$? - # Download will fail if downloads a html file. - if [ -f "${local_filedir}/${local_filename}" ]; then - if [ -n "$(head "${local_filedir}/${local_filename}" | grep "DOCTYPE")" ]; then - rm -f "${local_filedir:?}/${local_filename:?}" - local exitcode=2 - fi - fi - - # On first try will error. On second try will fail. - if [ "${exitcode}" != 0 ]; then - if [ ${counter} -ge 2 ]; then - echo -e "FAIL" - if [ -f "${lgsmlog}" ]; then - fn_script_log_fail "Downloading ${local_filename}" - fn_script_log_fail "${fileurl}" - fi - core_exit.sh - else - echo -e "ERROR" - if [ -f "${lgsmlog}" ]; then - fn_script_log_error "Downloading ${local_filename}" - fn_script_log_error "${fileurl}" - fi - fi - - else - echo -en "OK" - sleep 0.3 - echo -en "\033[2K\\r" - if [ -f "${lgsmlog}" ]; then - fn_script_log_pass "Downloading ${local_filename}" - fi - - # Make file executable if chmodx is set. - if [ "${chmodx}" == "chmodx" ]; then - chmod +x "${local_filedir}/${local_filename}" - fi - - # Remove trap. - trap - INT - - break - fi - done - fi - - if [ -f "${local_filedir}/${local_filename}" ]; then - # Execute file if run is set. - if [ "${run}" == "run" ]; then - # shellcheck source=/dev/null - source "${local_filedir}/${local_filename}" - fi - fi -} - -fn_bootstrap_fetch_file_github() { - github_file_url_dir="${1}" - github_file_url_name="${2}" - # If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork. - if [ "${githubbranch}" == "master" ] && [ "${githubuser}" == "GameServerManagers" ] && [ "${commandname}" != "UPDATE-LGSM" ]; then - remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}" - remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}" - else - remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${github_file_url_name}" - remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/${github_file_url_dir}/${github_file_url_name}" - fi - remote_fileurl_name="GitHub" - remote_fileurl_backup_name="Bitbucket" - local_filedir="${3}" - local_filename="${github_file_url_name}" - chmodx="${4:-0}" - run="${5:-0}" - forcedl="${6:-0}" - md5="${7:-0}" - # Passes vars to the file download module. - fn_bootstrap_fetch_file "${remote_fileurl}" "${remote_fileurl_backup}" "${remote_fileurl_name}" "${remote_fileurl_backup_name}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${md5}" -} - -# Installer menu. - -fn_print_center() { - columns=$(tput cols) - line="$*" - printf "%*s\n" $(((${#line} + columns) / 2)) "${line}" -} - -fn_print_horizontal() { - printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' "=" -} - -# Bash menu. -fn_install_menu_bash() { - local resultvar=$1 - title=$2 - caption=$3 - options=$4 - fn_print_horizontal - fn_print_center "${title}" - fn_print_center "${caption}" - fn_print_horizontal - menu_options=() - while read -r line || [[ -n "${line}" ]]; do - var=$(echo -e "${line}" | awk -F "," '{print $2 " - " $3}') - menu_options+=("${var}") - done < "${options}" - menu_options+=("Cancel") - select option in "${menu_options[@]}"; do - if [ "${option}" ] && [ "${option}" != "Cancel" ]; then - eval "$resultvar=\"${option/%\ */}\"" - fi - break - done -} - -# Whiptail/Dialog menu. -fn_install_menu_whiptail() { - local menucmd=$1 - local resultvar=$2 - title=$3 - caption=$4 - options=$5 - height=${6:-40} - width=${7:-80} - menuheight=${8:-30} - IFS="," - menu_options=() - while read -r line; do - key=$(echo -e "${line}" | awk -F "," '{print $3}') - val=$(echo -e "${line}" | awk -F "," '{print $2}') - menu_options+=("${val//\"/}" "${key//\"/}") - done < "${options}" - OPTION=$(${menucmd} --title "${title}" --menu "${caption}" "${height}" "${width}" "${menuheight}" "${menu_options[@]}" 3>&1 1>&2 2>&3) - if [ $? == 0 ]; then - eval "$resultvar=\"${OPTION}\"" - else - eval "$resultvar=" - fi -} - -# Menu selector. -fn_install_menu() { - local resultvar=$1 - local selection="" - title=$2 - caption=$3 - options=$4 - # Get menu command. - for menucmd in whiptail dialog bash; do - if [ "$(command -v "${menucmd}")" ]; then - menucmd=$(command -v "${menucmd}") - break - fi - done - case "$(basename "${menucmd}")" in - whiptail | dialog) - fn_install_menu_whiptail "${menucmd}" selection "${title}" "${caption}" "${options}" 40 80 30 - ;; - *) - fn_install_menu_bash selection "${title}" "${caption}" "${options}" - ;; - esac - eval "$resultvar=\"${selection}\"" -} - -# Gets server info from serverlist.csv and puts in to array. -fn_server_info() { - IFS="," - server_info_array=($(grep -aw "${userinput}" "${serverlist}")) - shortname="${server_info_array[0]}" # csgo - gameservername="${server_info_array[1]}" # csgoserver - gamename="${server_info_array[2]}" # Counter Strike: Global Offensive -} - -fn_install_getopt() { - userinput="empty" - echo -e "Usage: $0 [option]" - echo -e "" - echo -e "Installer - Linux Game Server Managers - Version ${version}" - echo -e "https://linuxgsm.com" - echo -e "" - echo -e "Commands" - echo -e "install\t\t| Select server to install." - echo -e "servername\t| Enter name of game server to install. e.g $0 csgoserver." - echo -e "list\t\t| List all servers available for install." - exit -} - -fn_install_file() { - local_filename="${gameservername}" - if [ -e "${local_filename}" ]; then - i=2 - while [ -e "${local_filename}-${i}" ]; do - ((i++)) - done - local_filename="${local_filename}-${i}" - fi - cp -R "${selfname}" "${local_filename}" - sed -i -e "s/shortname=\"core\"/shortname=\"${shortname}\"/g" "${local_filename}" - sed -i -e "s/gameservername=\"core\"/gameservername=\"${gameservername}\"/g" "${local_filename}" - echo -e "Installed ${gamename} server as ${local_filename}" - echo -e "" - if [ ! -d "${serverfiles}" ]; then - echo -e "./${local_filename} install" - else - echo -e "Remember to check server ports" - echo -e "./${local_filename} details" - fi - echo -e "" - exit -} - -# Prevent LinuxGSM from running as root. Except if doing a dependency install. -if [ "$(whoami)" == "root" ]; then - if [ "${userinput}" == "install" ] || [ "${userinput}" == "auto-install" ] || [ "${userinput}" == "i" ] || [ "${userinput}" == "ai" ]; then - if [ "${shortname}" == "core" ]; then - echo -e "[ FAIL ] Do NOT run this script as root!" - exit 1 - fi - elif [ ! -f "${modulesdir}/core_modules.sh" ] || [ ! -f "${modulesdir}/check_root.sh" ] || [ ! -f "${modulesdir}/core_messages.sh" ]; then - echo -e "[ FAIL ] Do NOT run this script as root!" - exit 1 - else - core_modules.sh - check_root.sh - fi -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" "nohash" - if [ ! -f "${serverlist}" ]; then - echo -e "[ FAIL ] serverlist.csv could not be loaded." - exit 1 - fi - - if [ "${userinput}" == "list" ] || [ "${userinput}" == "l" ]; then - { - tail -n +2 "${serverlist}" | awk -F "," '{print $2 "\t" $3}' - } | column -s $'\t' -t | more - exit - elif [ "${userinput}" == "install" ] || [ "${userinput}" == "i" ]; then - tail -n +2 "${serverlist}" | awk -F "," '{print $1 "," $2 "," $3}' > "${serverlistmenu}" - fn_install_menu result "LinuxGSM" "Select game server to install." "${serverlistmenu}" - userinput="${result}" - fn_server_info - if [ "${result}" == "${gameservername}" ]; then - fn_install_file - elif [ "${result}" == "" ]; then - echo -e "Install canceled" - else - echo -e "[ FAIL ] menu result does not match gameservername" - echo -e "result: ${result}" - echo -e "gameservername: ${gameservername}" - fi - elif [ "${userinput}" ]; then - fn_server_info - if [ "${userinput}" == "${gameservername}" ] || [ "${userinput}" == "${gamename}" ] || [ "${userinput}" == "${shortname}" ]; then - fn_install_file - else - echo -e "[ FAIL ] Unknown game server" - fi - else - fn_install_getopt - fi - -# LinuxGSM server mode. -else - core_modules.sh - if [ "${shortname}" != "core-dep" ]; then - # Load LinuxGSM configs. - # These are required to get all the default variables for the specific server. - # Load the default config. If missing download it. If changed reload it. - if [ ! -f "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" ]; then - mkdir -p "${configdirdefault}/config-lgsm/${gameservername}" - fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforcedl" "nohash" - fi - if [ ! -f "${configdirserver}/_default.cfg" ]; then - mkdir -p "${configdirserver}" - echo -en "copying _default.cfg...\c" - cp -R "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg" - exitcode=$? - if [ "${exitcode}" != 0 ]; then - echo -e "FAIL" - exit 1 - else - echo -e "OK" - fi - else - module_file_diff=$(diff -q "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg") - if [ "${module_file_diff}" != "" ]; then - fn_print_warn_nl "_default.cfg has been altered. reloading config." - echo -en "copying _default.cfg...\c" - cp -R "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg" - exitcode=$? - if [ "${exitcode}" != 0 ]; then - echo -e "FAIL" - exit 1 - else - echo -e "OK" - fi - fi - fi - # shellcheck source=/dev/null - source "${configdirserver}/_default.cfg" - # Load the common.cfg config. If missing download it. - if [ ! -f "${configdirserver}/common.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash" - # shellcheck source=/dev/null - source "${configdirserver}/common.cfg" - else - # shellcheck source=/dev/null - source "${configdirserver}/common.cfg" - fi - # Load the secrets-common.cfg config. If missing download it. - if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash" - # shellcheck source=/dev/null - source "${configdirserver}/secrets-common.cfg" - else - # shellcheck source=/dev/null - source "${configdirserver}/secrets-common.cfg" - fi - # Load the instance.cfg config. If missing download it. - if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash" - # shellcheck source=/dev/null - source "${configdirserver}/${selfname}.cfg" - else - # shellcheck source=/dev/null - source "${configdirserver}/${selfname}.cfg" - fi - # Load the secrets-instance.cfg config. If missing download it. - if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash" - # shellcheck source=/dev/null - source "${configdirserver}/secrets-${selfname}.cfg" - else - # shellcheck source=/dev/null - source "${configdirserver}/secrets-${selfname}.cfg" - fi - - # Load the linuxgsm.sh in to tmpdir. If missing download it. - if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then - fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nohash" - fi - fi - # Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off. - fn_ansi_loader - # Prevents running of core_exit.sh for Travis-CI. - if [ "${travistest}" != "1" ]; then - getopt=$1 - core_getopt.sh - fi -fi - -fn_currentstatus_tmux() { - check_status.sh - if [ "${status}" != "0" ]; then - currentstatus="STARTED" - else - currentstatus="STOPPED" - fi -} - -fn_setstatus() { - fn_currentstatus_tmux - echo"" - echo -e "Required status: ${requiredstatus}" - counter=0 - echo -e "Current status: ${currentstatus}" - while [ "${requiredstatus}" != "${currentstatus}" ]; do - counter=$((counter + 1)) - fn_currentstatus_tmux - echo -en "New status: ${currentstatus}\\r" - - if [ "${requiredstatus}" == "STARTED" ]; then - (command_start.sh > /dev/null 2>&1) - else - (command_stop.sh > /dev/null 2>&1) - fi - if [ "${counter}" -gt "5" ]; then - currentstatus="FAIL" - echo -e "Current status: ${currentstatus}" - echo -e "" - echo -e "Unable to start or stop server." - exit 1 - fi - done - echo -en "New status: ${currentstatus}\\r" - echo -e "\n" - echo -e "Test starting:" - echo -e "" -} - -# End of every test will expect the result to either pass or fail -# If the script does not do as intended the whole test will fail -# if expecting a pass -fn_test_result_pass() { - if [ $? != 0 ]; then - echo -e "=================================" - echo -e "Expected result: PASS" - echo -e "Actual result: FAIL" - fn_print_fail_nl "TEST FAILED" - exitcode=1 - core_exit.sh - else - echo -e "=================================" - echo -e "Expected result: PASS" - echo -e "Actual result: PASS" - fn_print_ok_nl "TEST PASSED" - echo -e "" - fi -} - -# if expecting a fail -fn_test_result_fail() { - if [ $? == 0 ]; then - echo -e "=================================" - echo -e "Expected result: FAIL" - echo -e "Actual result: PASS" - fn_print_fail_nl "TEST FAILED" - exitcode=1 - core_exit.sh - else - echo -e "=================================" - echo -e "Expected result: FAIL" - echo -e "Actual result: FAIL" - fn_print_ok_nl "TEST PASSED" - echo -e "" - fi -} - -# test result n/a -fn_test_result_na() { - echo -e "=================================" - echo -e "Expected result: N/A" - echo -e "Actual result: N/A" - fn_print_fail_nl "TEST N/A" -} - -sleeptime="0" - -echo -e "=================================" -echo -e "Travis CI Tests" -echo -e "Linux Game Server Manager" -echo -e "by Daniel Gibbs" -echo -e "Contributors: http://goo.gl/qLmitD" -echo -e "https://linuxgsm.com" -echo -e "=================================" -echo -e "" -echo -e "=================================" -echo -e "Server Tests" -echo -e "Using: ${gamename}" -echo -e "Testing Branch: ${TRAVIS_BRANCH}" -echo -e "=================================" - -echo -e "" -echo -e "Tests Summary" -echo -e "=================================" -echo -e "0.0 - Pre-test Tasks" -echo -e "0.1 - Create log dir's" -echo -e "0.2 - Enable dev-debug" -echo -e "" -echo -e "1.0 - Pre-install tests" -echo -e "1.1 - start - no files" -echo -e "1.2 - getopt" -echo -e "1.3 - getopt with incorrect args" -echo -e "" -echo -e "2.0 - Installation" -echo -e "2.1 - install" -echo -e "" -echo -e "3.0 - Start/Stop/Restart Tests" -echo -e "3.1 - start" -echo -e "3.2 - start - online" -echo -e "3.3 - start - updateonstart" -echo -e "3.4 - stop" -echo -e "3.5 - stop - offline" -echo -e "3.6 - restart" -echo -e "3.7 - restart - offline" -echo -e "" -echo -e "4.0 - Update Tests" -echo -e "4.1 - update" -echo -e "4.2 - update-lgsm" -echo -e "" -echo -e "5.0 - Monitor Tests" -echo -e "5.1 - monitor - online" -echo -e "5.2 - monitor - offline - with lockfile" -echo -e "5.3 - monitor - offline - no lockfile" -echo -e "5.4 - test-alert" -echo -e "" -echo -e "6.0 - Details Tests" -echo -e "6.1 - details" -echo -e "6.2 - postdetails" -echo -e "" -echo -e "7.0 - Backup Tests" -echo -e "7.1 - backup" -echo -e "" -echo -e "8.0 - Development Tools Tests" -echo -e "8.1 - dev - detect glibc" -echo -e "8.2 - dev - detect ldd" -echo -e "8.3 - dev - detect deps" -echo -e "8.4 - dev - query-raw" - -echo -e "" -echo -e "9.0 - Sponsor" -echo -e "9.1 - sponsor" -echo -e "" - -echo -e "0.0 - Pre-test Tasks" -echo -e "==================================================================" -echo -e "Description:" -echo -e "Create log dir's" -echo -e "" - -echo -e "" -echo -e "0.1 - Create log dir's" -echo -e "=================================" -echo -e "" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - install_logs.sh -) -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "0.2 - Enable dev-debug" -echo -e "=================================" -echo -e "Description:" -echo -e "Enable dev-debug" -echo -e "" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_debug.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "1.0 - Pre-install tests" -echo -e "==================================================================" -echo -e "" - -echo -e "1.1 - start - no files" -echo -e "=================================" -echo -e "Description:" -echo -e "test script reaction to missing server files." -echo -e "Command: ./${gameservername} start" -echo -e "" -# Allows for testing not on Travis CI -if [ -z "${TRAVIS}" ]; then - ( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_start.sh - ) - fn_test_result_fail -else - echo -e "Test bypassed" -fi - -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "1.2 - getopt" -echo -e "=================================" -echo -e "Description:" -echo -e "displaying options messages." -echo -e "Command: ./${gameservername}" -echo -e "" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - core_getopt.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "1.3 - getopt with incorrect args" -echo -e "=================================" -echo -e "Description:" -echo -e "displaying options messages." -echo -e "Command: ./${gameservername} abc123" -echo -e "" -getopt="abc123" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - core_getopt.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "2.0 - Installation" -echo -e "==================================================================" - -echo -e "" -echo -e "2.1 - install" -echo -e "=================================" -echo -e "Description:" -echo -e "install ${gamename} server." -echo -e "Command: ./${gameservername} auto-install" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - fn_autoinstall -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.0 - Start/Stop/Restart Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "3.1 - start" -echo -e "=================================" -echo -e "Description:" -echo -e "start ${gamename} server." -echo -e "Command: ./${gameservername} start" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_start.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.2 - start - online" -echo -e "=================================" -echo -e "Description:" -echo -e "start ${gamename} server while already running." -echo -e "Command: ./${gameservername} start" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_start.sh -) -fn_test_result_fail -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.3 - start - updateonstart" -echo -e "=================================" -echo -e "Description:" -echo -e "will update server on start." -echo -e "Command: ./${gameservername} start" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - updateonstart="on" - command_start.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.4 - stop" -echo -e "=================================" -echo -e "Description:" -echo -e "stop ${gamename} server." -echo -e "Command: ./${gameservername} stop" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_stop.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.5 - stop - offline" -echo -e "=================================" -echo -e "Description:" -echo -e "stop ${gamename} server while already stopped." -echo -e "Command: ./${gameservername} stop" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_stop.sh -) -fn_test_result_fail -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.6 - restart" -echo -e "=================================" -echo -e "Description:" -echo -e "restart ${gamename}." -echo -e "Command: ./${gameservername} restart" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_restart.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.7 - restart - offline" -echo -e "=================================" -echo -e "Description:" -echo -e "restart ${gamename} while already stopped." -echo -e "Command: ./${gameservername} restart" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_restart.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "4.0 - Update Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "4.1 - update" -echo -e "=================================" -echo -e "Description:" -echo -e "check for updates." -echo -e "Command: ./${gameservername} update" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_update.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "4.2 - update-lgsm" -echo -e "=================================" -echo -e "Description:" -echo -e "update LinuxGSM." -echo -e "" -echo -e "Command: ./jc2server update-lgam" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_update_linuxgsm.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "5.0 - Monitor Tests" -echo -e "==================================================================" -echo -e "" -info_game.sh -echo -e "Server IP - Port: ${ip}:${port}" -echo -e "Server IP - Query Port: ${ip}:${queryport}" - -echo -e "" -echo -e "5.1 - monitor - online" -echo -e "=================================" -echo -e "Description:" -echo -e "run monitor server while already running." -echo -e "Command: ./${gameservername} monitor" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_monitor.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "5.2 - monitor - offline - with lockfile" -echo -e "=================================" -echo -e "Description:" -echo -e "run monitor while server is offline with lockfile." -echo -e "Command: ./${gameservername} monitor" -requiredstatus="STOPPED" -fn_setstatus -fn_print_info_nl "creating lockfile." -date '+%s' > "${lockdir}/${selfname}.lock" -echo "${version}" >> "${lockdir}/${selfname}.lock" -echo "${port}" >> "${lockdir}/${selfname}.lock" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_monitor.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "5.3 - monitor - offline - no lockfile" -echo -e "=================================" -echo -e "Description:" -echo -e "run monitor while server is offline with no lockfile." -echo -e "Command: ./${gameservername} monitor" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_monitor.sh -) -fn_test_result_fail -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "5.4 - test-alert" -echo -e "=================================" -echo -e "Description:" -echo -e "run monitor while server is offline with no lockfile." -echo -e "Command: ./${gameservername} test-alert" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_test_alert.sh -) -fn_test_result_fail -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "6.0 - Details Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "6.1 - details" -echo -e "=================================" -echo -e "Description:" -echo -e "display details." -echo -e "Command: ./${gameservername} details" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_details.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "6.2 - postdetails" -echo -e "=================================" -echo -e "Description:" -echo -e "post details." -echo -e "Command: ./${gameservername} postdetails" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_postdetails.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "7.0 - Backup Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "7.1 - backup" -echo -e "=================================" -echo -e "Description:" -echo -e "run a backup." -echo -e "Command: ./${gameservername} backup" -requiredstatus="STARTED" -fn_setstatus -echo -e "test de-activated until issue #1839 fixed" -#(command_backup.sh) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "8.0 - Development Tools Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "8.1 - dev - detect glibc" -echo -e "=================================" -echo -e "Description:" -echo -e "detect glibc." -echo -e "Command: ./${gameservername} detect-glibc" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_detect_glibc.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "8.2 - dev - detect ldd" -echo -e "=================================" -echo -e "Description:" -echo -e "detect ldd." -echo -e "Command: ./${gameservername} detect-ldd" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_detect_ldd.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "8.3 - dev - detect deps" -echo -e "=================================" -echo -e "Description:" -echo -e "detect dependencies." -echo -e "Command: ./${gameservername} detect-deps" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_detect_deps.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "8.4 - dev - query-raw" -echo -e "=================================" -echo -e "Description:" -echo -e "raw query output." -echo -e "Command: ./${gameservername} query-raw" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_query_raw.sh -) -fn_test_result_na -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" - -echo -e "9.0 - Sponsor" -echo -e "==================================================================" - -echo -e "" -echo -e "9.1 - sponsor" -echo -e "=================================" -echo -e "Description:" -echo -e "sponsor." -echo -e "Command: ./${gameservername} sponsor" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_sponsor.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "=================================" -echo -e "Server Tests - Complete!" -echo -e "Using: ${gamename}" -echo -e "=================================" -requiredstatus="STOPPED" -fn_setstatus - -core_exit.sh diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh deleted file mode 100644 index adf59ab92..000000000 --- a/tests/tests_jc2server.sh +++ /dev/null @@ -1,1352 +0,0 @@ -#!/bin/bash -# Project: Game Server Managers - LinuxGSM -# Author: Daniel Gibbs -# License: MIT License, Copyright (c) 2020 Daniel Gibbs -# Purpose: Travis CI Tests: Just Cause 2 | Linux Game Server Management Script -# Contributors: https://linuxgsm.com/contrib -# Documentation: https://docs.linuxgsm.com -# Website: https://linuxgsm.com - -# DO NOT EDIT THIS FILE -# LinuxGSM configuration is no longer edited here -# To update your LinuxGSM config go to: -# lgsm/config-lgsm -# https://docs.linuxgsm.com/configuration/linuxgsm-config - -# Debugging -if [ -f ".dev-debug" ]; then - exec 5> dev-debug.log - BASH_XTRACEFD="5" - set -x -fi - -version="v23.5.3" -shortname="jc2" -gameservername="jc2server" -commandname="CORE" -rootdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") -selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")") -sessionname=$(echo "${selfname}" | cut -f1 -d".") -lgsmdir="${rootdir}/lgsm" -logdir="${rootdir}/log" -lgsmlogdir="${logdir}/lgsm" -steamcmddir="${HOME}/.steam/steamcmd" -serverfiles="${rootdir}/serverfiles" -modulesdir="${lgsmdir}/modules" -tmpdir="${lgsmdir}/tmp" -datadir="${lgsmdir}/data" -lockdir="${lgsmdir}/lock" -serverlist="${datadir}/serverlist.csv" -serverlistmenu="${datadir}/serverlistmenu.csv" -configdir="${lgsmdir}/config-lgsm" -configdirserver="${configdir}/${gameservername}" -configdirdefault="${lgsmdir}/config-default" -userinput="${1}" - -# Allows for testing not on Travis CI. -# if using travis for tests -if [ -z "${TRAVIS}" ]; then - TRAVIS_BRANCH="develop" - TRAVIS_BUILD_DIR="${rootdir}" -fi -travistest="1" - -## GitHub Branch Select -# Allows for the use of different module files -# from a different repo and/or branch. -githubuser="GameServerManagers" -githubrepo="LinuxGSM" -githubbranch="${TRAVIS_BRANCH}" - -# Core module that is required first. -core_modules.sh() { - modulefile="${FUNCNAME[0]}" - fn_bootstrap_fetch_file_github "lgsm/modules" "core_modules.sh" "${modulesdir}" "chmodx" "run" "noforcedl" "nohash" -} - -# Bootstrap -# Fetches the core modules required before passed off to core_dl.sh. -fn_bootstrap_fetch_file() { - remote_fileurl="${1}" - remote_fileurl_backup="${2}" - remote_fileurl_name="${3}" - remote_fileurl_backup_name="${4}" - local_filedir="${5}" - local_filename="${6}" - chmodx="${7:-0}" - run="${8:-0}" - forcedl="${9:-0}" - md5="${10:-0}" - # Download file if missing or download forced. - if [ ! -f "${local_filedir}/${local_filename}" ] || [ "${forcedl}" == "forcedl" ]; then - # If backup fileurl exists include it. - if [ -n "${remote_fileurl_backup}" ]; then - # counter set to 0 to allow second try - counter=0 - remote_fileurls_array=(remote_fileurl remote_fileurl_backup) - else - # counter set to 1 to not allow second try - counter=1 - remote_fileurls_array=(remote_fileurl) - fi - - for remote_fileurl_array in "${remote_fileurls_array[@]}"; do - if [ "${remote_fileurl_array}" == "remote_fileurl" ]; then - fileurl="${remote_fileurl}" - fileurl_name="${remote_fileurl_name}" - elif [ "${remote_fileurl_array}" == "remote_fileurl_backup" ]; then - fileurl="${remote_fileurl_backup}" - fileurl_name="${remote_fileurl_backup_name}" - fi - counter=$((counter + 1)) - if [ ! -d "${local_filedir}" ]; then - mkdir -p "${local_filedir}" - fi - # Trap will remove part downloaded files if canceled. - trap fn_fetch_trap INT - # Larger files show a progress bar. - - echo -en "fetching ${fileurl_name} ${local_filename}...\c" - curlcmd=$(curl -s --fail -L -o "${local_filedir}/${local_filename}" "${fileurl}" 2>&1) - - local exitcode=$? - # Download will fail if downloads a html file. - if [ -f "${local_filedir}/${local_filename}" ]; then - if [ -n "$(head "${local_filedir}/${local_filename}" | grep "DOCTYPE")" ]; then - rm -f "${local_filedir:?}/${local_filename:?}" - local exitcode=2 - fi - fi - - # On first try will error. On second try will fail. - if [ "${exitcode}" != 0 ]; then - if [ ${counter} -ge 2 ]; then - echo -e "FAIL" - if [ -f "${lgsmlog}" ]; then - fn_script_log_fail "Downloading ${local_filename}" - fn_script_log_fail "${fileurl}" - fi - core_exit.sh - else - echo -e "ERROR" - if [ -f "${lgsmlog}" ]; then - fn_script_log_error "Downloading ${local_filename}" - fn_script_log_error "${fileurl}" - fi - fi - - else - echo -en "OK" - sleep 0.3 - echo -en "\033[2K\\r" - if [ -f "${lgsmlog}" ]; then - fn_script_log_pass "Downloading ${local_filename}" - fi - - # Make file executable if chmodx is set. - if [ "${chmodx}" == "chmodx" ]; then - chmod +x "${local_filedir}/${local_filename}" - fi - - # Remove trap. - trap - INT - - break - fi - done - fi - - if [ -f "${local_filedir}/${local_filename}" ]; then - # Execute file if run is set. - if [ "${run}" == "run" ]; then - # shellcheck source=/dev/null - source "${local_filedir}/${local_filename}" - fi - fi -} - -fn_bootstrap_fetch_file_github() { - github_file_url_dir="${1}" - github_file_url_name="${2}" - # If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork. - if [ "${githubbranch}" == "master" ] && [ "${githubuser}" == "GameServerManagers" ] && [ "${commandname}" != "UPDATE-LGSM" ]; then - remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}" - remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}" - else - remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${github_file_url_name}" - remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/${github_file_url_dir}/${github_file_url_name}" - fi - remote_fileurl_name="GitHub" - remote_fileurl_backup_name="Bitbucket" - local_filedir="${3}" - local_filename="${github_file_url_name}" - chmodx="${4:-0}" - run="${5:-0}" - forcedl="${6:-0}" - md5="${7:-0}" - # Passes vars to the file download module. - fn_bootstrap_fetch_file "${remote_fileurl}" "${remote_fileurl_backup}" "${remote_fileurl_name}" "${remote_fileurl_backup_name}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${md5}" -} - -# Installer menu. - -fn_print_center() { - columns=$(tput cols) - line="$*" - printf "%*s\n" $(((${#line} + columns) / 2)) "${line}" -} - -fn_print_horizontal() { - printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' "=" -} - -# Bash menu. -fn_install_menu_bash() { - local resultvar=$1 - title=$2 - caption=$3 - options=$4 - fn_print_horizontal - fn_print_center "${title}" - fn_print_center "${caption}" - fn_print_horizontal - menu_options=() - while read -r line || [[ -n "${line}" ]]; do - var=$(echo -e "${line}" | awk -F "," '{print $2 " - " $3}') - menu_options+=("${var}") - done < "${options}" - menu_options+=("Cancel") - select option in "${menu_options[@]}"; do - if [ "${option}" ] && [ "${option}" != "Cancel" ]; then - eval "$resultvar=\"${option/%\ */}\"" - fi - break - done -} - -# Whiptail/Dialog menu. -fn_install_menu_whiptail() { - local menucmd=$1 - local resultvar=$2 - title=$3 - caption=$4 - options=$5 - height=${6:-40} - width=${7:-80} - menuheight=${8:-30} - IFS="," - menu_options=() - while read -r line; do - key=$(echo -e "${line}" | awk -F "," '{print $3}') - val=$(echo -e "${line}" | awk -F "," '{print $2}') - menu_options+=("${val//\"/}" "${key//\"/}") - done < "${options}" - OPTION=$(${menucmd} --title "${title}" --menu "${caption}" "${height}" "${width}" "${menuheight}" "${menu_options[@]}" 3>&1 1>&2 2>&3) - if [ $? == 0 ]; then - eval "$resultvar=\"${OPTION}\"" - else - eval "$resultvar=" - fi -} - -# Menu selector. -fn_install_menu() { - local resultvar=$1 - local selection="" - title=$2 - caption=$3 - options=$4 - # Get menu command. - for menucmd in whiptail dialog bash; do - if [ "$(command -v "${menucmd}")" ]; then - menucmd=$(command -v "${menucmd}") - break - fi - done - case "$(basename "${menucmd}")" in - whiptail | dialog) - fn_install_menu_whiptail "${menucmd}" selection "${title}" "${caption}" "${options}" 40 80 30 - ;; - *) - fn_install_menu_bash selection "${title}" "${caption}" "${options}" - ;; - esac - eval "$resultvar=\"${selection}\"" -} - -# Gets server info from serverlist.csv and puts in to array. -fn_server_info() { - IFS="," - server_info_array=($(grep -aw "${userinput}" "${serverlist}")) - shortname="${server_info_array[0]}" # csgo - gameservername="${server_info_array[1]}" # csgoserver - gamename="${server_info_array[2]}" # Counter Strike: Global Offensive -} - -fn_install_getopt() { - userinput="empty" - echo -e "Usage: $0 [option]" - echo -e "" - echo -e "Installer - Linux Game Server Managers - Version ${version}" - echo -e "https://linuxgsm.com" - echo -e "" - echo -e "Commands" - echo -e "install\t\t| Select server to install." - echo -e "servername\t| Enter name of game server to install. e.g $0 csgoserver." - echo -e "list\t\t| List all servers available for install." - exit -} - -fn_install_file() { - local_filename="${gameservername}" - if [ -e "${local_filename}" ]; then - i=2 - while [ -e "${local_filename}-${i}" ]; do - ((i++)) - done - local_filename="${local_filename}-${i}" - fi - cp -R "${selfname}" "${local_filename}" - sed -i -e "s/shortname=\"core\"/shortname=\"${shortname}\"/g" "${local_filename}" - sed -i -e "s/gameservername=\"core\"/gameservername=\"${gameservername}\"/g" "${local_filename}" - echo -e "Installed ${gamename} server as ${local_filename}" - echo -e "" - if [ ! -d "${serverfiles}" ]; then - echo -e "./${local_filename} install" - else - echo -e "Remember to check server ports" - echo -e "./${local_filename} details" - fi - echo -e "" - exit -} - -# Prevent LinuxGSM from running as root. Except if doing a dependency install. -if [ "$(whoami)" == "root" ]; then - if [ "${userinput}" == "install" ] || [ "${userinput}" == "auto-install" ] || [ "${userinput}" == "i" ] || [ "${userinput}" == "ai" ]; then - if [ "${shortname}" == "core" ]; then - echo -e "[ FAIL ] Do NOT run this script as root!" - exit 1 - fi - elif [ ! -f "${modulesdir}/core_modules.sh" ] || [ ! -f "${modulesdir}/check_root.sh" ] || [ ! -f "${modulesdir}/core_messages.sh" ]; then - echo -e "[ FAIL ] Do NOT run this script as root!" - exit 1 - else - core_modules.sh - check_root.sh - fi -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" "nohash" - if [ ! -f "${serverlist}" ]; then - echo -e "[ FAIL ] serverlist.csv could not be loaded." - exit 1 - fi - - if [ "${userinput}" == "list" ] || [ "${userinput}" == "l" ]; then - { - tail -n +2 "${serverlist}" | awk -F "," '{print $2 "\t" $3}' - } | column -s $'\t' -t | more - exit - elif [ "${userinput}" == "install" ] || [ "${userinput}" == "i" ]; then - tail -n +2 "${serverlist}" | awk -F "," '{print $1 "," $2 "," $3}' > "${serverlistmenu}" - fn_install_menu result "LinuxGSM" "Select game server to install." "${serverlistmenu}" - userinput="${result}" - fn_server_info - if [ "${result}" == "${gameservername}" ]; then - fn_install_file - elif [ "${result}" == "" ]; then - echo -e "Install canceled" - else - echo -e "[ FAIL ] menu result does not match gameservername" - echo -e "result: ${result}" - echo -e "gameservername: ${gameservername}" - fi - elif [ "${userinput}" ]; then - fn_server_info - if [ "${userinput}" == "${gameservername}" ] || [ "${userinput}" == "${gamename}" ] || [ "${userinput}" == "${shortname}" ]; then - fn_install_file - else - echo -e "[ FAIL ] Unknown game server" - fi - else - fn_install_getopt - fi - -# LinuxGSM server mode. -else - core_modules.sh - if [ "${shortname}" != "core-dep" ]; then - # Load LinuxGSM configs. - # These are required to get all the default variables for the specific server. - # Load the default config. If missing download it. If changed reload it. - if [ ! -f "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" ]; then - mkdir -p "${configdirdefault}/config-lgsm/${gameservername}" - fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforcedl" "nohash" - fi - if [ ! -f "${configdirserver}/_default.cfg" ]; then - mkdir -p "${configdirserver}" - echo -en "copying _default.cfg...\c" - cp -R "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg" - exitcode=$? - if [ "${exitcode}" != 0 ]; then - echo -e "FAIL" - exit 1 - else - echo -e "OK" - fi - else - module_file_diff=$(diff -q "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg") - if [ "${module_file_diff}" != "" ]; then - fn_print_warn_nl "_default.cfg has been altered. reloading config." - echo -en "copying _default.cfg...\c" - cp -R "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg" - exitcode=$? - if [ "${exitcode}" != 0 ]; then - echo -e "FAIL" - exit 1 - else - echo -e "OK" - fi - fi - fi - # shellcheck source=/dev/null - source "${configdirserver}/_default.cfg" - # Load the common.cfg config. If missing download it. - if [ ! -f "${configdirserver}/common.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash" - # shellcheck source=/dev/null - source "${configdirserver}/common.cfg" - else - # shellcheck source=/dev/null - source "${configdirserver}/common.cfg" - fi - # Load the secrets-common.cfg config. If missing download it. - if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash" - # shellcheck source=/dev/null - source "${configdirserver}/secrets-common.cfg" - else - # shellcheck source=/dev/null - source "${configdirserver}/secrets-common.cfg" - fi - # Load the instance.cfg config. If missing download it. - if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash" - # shellcheck source=/dev/null - source "${configdirserver}/${selfname}.cfg" - else - # shellcheck source=/dev/null - source "${configdirserver}/${selfname}.cfg" - fi - # Load the secrets-instance.cfg config. If missing download it. - if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash" - # shellcheck source=/dev/null - source "${configdirserver}/secrets-${selfname}.cfg" - else - # shellcheck source=/dev/null - source "${configdirserver}/secrets-${selfname}.cfg" - fi - - # Load the linuxgsm.sh in to tmpdir. If missing download it. - if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then - fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nohash" - fi - fi - # Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off. - fn_ansi_loader - # Prevents running of core_exit.sh for Travis-CI. - if [ "${travistest}" != "1" ]; then - getopt=$1 - core_getopt.sh - fi -fi - -fn_currentstatus_tmux() { - check_status.sh - if [ "${status}" != "0" ]; then - currentstatus="STARTED" - else - currentstatus="STOPPED" - fi -} - -fn_setstatus() { - fn_currentstatus_tmux - echo"" - echo -e "Required status: ${requiredstatus}" - counter=0 - echo -e "Current status: ${currentstatus}" - while [ "${requiredstatus}" != "${currentstatus}" ]; do - counter=$((counter + 1)) - fn_currentstatus_tmux - echo -en "New status: ${currentstatus}\\r" - - if [ "${requiredstatus}" == "STARTED" ]; then - (command_start.sh > /dev/null 2>&1) - else - (command_stop.sh > /dev/null 2>&1) - fi - if [ "${counter}" -gt "5" ]; then - currentstatus="FAIL" - echo -e "Current status: ${currentstatus}" - echo -e "" - echo -e "Unable to start or stop server." - exit 1 - fi - done - echo -en "New status: ${currentstatus}\\r" - echo -e "\n" - echo -e "Test starting:" - echo -e "" -} - -# End of every test will expect the result to either pass or fail -# If the script does not do as intended the whole test will fail -# if expecting a pass -fn_test_result_pass() { - if [ $? != 0 ]; then - echo -e "=================================" - echo -e "Expected result: PASS" - echo -e "Actual result: FAIL" - fn_print_fail_nl "TEST FAILED" - exitcode=1 - core_exit.sh - else - echo -e "=================================" - echo -e "Expected result: PASS" - echo -e "Actual result: PASS" - fn_print_ok_nl "TEST PASSED" - echo -e "" - fi -} - -# if expecting a fail -fn_test_result_fail() { - if [ $? == 0 ]; then - echo -e "=================================" - echo -e "Expected result: FAIL" - echo -e "Actual result: PASS" - fn_print_fail_nl "TEST FAILED" - exitcode=1 - core_exit.sh - else - echo -e "=================================" - echo -e "Expected result: FAIL" - echo -e "Actual result: FAIL" - fn_print_ok_nl "TEST PASSED" - echo -e "" - fi -} - -# test result n/a -fn_test_result_na() { - echo -e "=================================" - echo -e "Expected result: N/A" - echo -e "Actual result: N/A" - fn_print_fail_nl "TEST N/A" -} - -sleeptime="0" - -echo -e "=================================" -echo -e "Travis CI Tests" -echo -e "Linux Game Server Manager" -echo -e "by Daniel Gibbs" -echo -e "Contributors: http://goo.gl/qLmitD" -echo -e "https://linuxgsm.com" -echo -e "=================================" -echo -e "" -echo -e "=================================" -echo -e "Server Tests" -echo -e "Using: ${gamename}" -echo -e "Testing Branch: ${TRAVIS_BRANCH}" -echo -e "=================================" -echo -e "" -echo -e "Tests Summary" -echo -e "=================================" -echo -e "0.0 - Pre-test Tasks" -echo -e "0.1 - Create log dir's" -echo -e "0.2 - Enable dev-debug" -echo -e "" -echo -e "1.0 - Pre-install tests" -echo -e "1.1 - start - no files" -echo -e "1.2 - getopt" -echo -e "1.3 - getopt with incorrect args" -echo -e "" -echo -e "2.0 - Installation" -echo -e "2.1 - install" -echo -e "" -echo -e "3.0 - Start/Stop/Restart Tests" -echo -e "3.1 - start" -echo -e "3.2 - start - online" -echo -e "3.3 - start - updateonstart" -echo -e "3.4 - stop" -echo -e "3.5 - stop - offline" -echo -e "3.6 - restart" -echo -e "3.7 - restart - offline" -echo -e "" -echo -e "4.0 - Update Tests" -echo -e "4.1 - update" -echo -e "4.2 - update - change buildid" -echo -e "4.3 - update - change buildid - online" -echo -e "4.4 - update - remove appmanifest file" -echo -e "4.5 - force-update" -echo -e "4.6 - force-update - online" -echo -e "4.7 - validate" -echo -e "4.8 - validate - online" -echo -e "4.9 - update-lgsm" -echo -e "" -echo -e "5.0 - Monitor Tests" -echo -e "5.1 - monitor - online" -echo -e "5.2 - monitor - offline - with lockfile" -echo -e "5.3 - monitor - offline - no lockfile" -echo -e "5.4 - test-alert" -echo -e "" -echo -e "6.0 - Details Tests" -echo -e "6.1 - details" -echo -e "6.2 - postdetails" -echo -e "" -echo -e "7.0 - Backup Tests" -echo -e "7.1 - backup" -echo -e "" -echo -e "8.0 - Development Tools Tests" -echo -e "8.1 - dev - detect glibc" -echo -e "8.2 - dev - detect ldd" -echo -e "8.3 - dev - detect deps" -echo -e "8.4 - dev - query-raw" -echo -e "" -echo -e "9.0 - Sponsor" -echo -e "9.1 - sponsor" -echo -e "" -echo -e "0.0 - Pre-test Tasks" -echo -e "==================================================================" -echo -e "Description:" -echo -e "Create log dir's" -echo -e "" - -echo -e "" -echo -e "0.1 - Create log dir's" -echo -e "=================================" -echo -e "" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - install_logs.sh -) -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "0.2 - Enable dev-debug" -echo -e "=================================" -echo -e "Description:" -echo -e "Enable dev-debug" -echo -e "" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_debug.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "1.0 - Pre-install tests" -echo -e "==================================================================" -echo -e "" - -echo -e "1.1 - start - no files" -echo -e "=================================" -echo -e "Description:" -echo -e "test script reaction to missing server files." -echo -e "Command: ./${gameservername} start" -echo -e "" -# Allows for testing not on Travis CI -if [ -z "${TRAVIS}" ]; then - ( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_start.sh - ) - fn_test_result_fail -else - echo -e "Test bypassed" -fi - -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "1.2 - getopt" -echo -e "=================================" -echo -e "Description:" -echo -e "displaying options messages." -echo -e "Command: ./${gameservername}" -echo -e "" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - core_getopt.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "1.3 - getopt with incorrect args" -echo -e "=================================" -echo -e "Description:" -echo -e "displaying options messages." -echo -e "Command: ./${gameservername} abc123" -echo -e "" -getopt="abc123" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - core_getopt.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "2.0 - Installation" -echo -e "==================================================================" - -echo -e "" -echo -e "2.1 - install" -echo -e "=================================" -echo -e "Description:" -echo -e "install ${gamename} server." -echo -e "Command: ./${gameservername} auto-install" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - fn_autoinstall -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.0 - Start/Stop/Restart Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "3.1 - start" -echo -e "=================================" -echo -e "Description:" -echo -e "start ${gamename} server." -echo -e "Command: ./${gameservername} start" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_start.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.2 - start - online" -echo -e "=================================" -echo -e "Description:" -echo -e "start ${gamename} server while already running." -echo -e "Command: ./${gameservername} start" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_start.sh -) -fn_test_result_fail -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.3 - start - updateonstart" -echo -e "=================================" -echo -e "Description:" -echo -e "will update server on start." -echo -e "Command: ./${gameservername} start" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - updateonstart="on" - command_start.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.4 - stop" -echo -e "=================================" -echo -e "Description:" -echo -e "stop ${gamename} server." -echo -e "Command: ./${gameservername} stop" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_stop.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.5 - stop - offline" -echo -e "=================================" -echo -e "Description:" -echo -e "stop ${gamename} server while already stopped." -echo -e "Command: ./${gameservername} stop" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_stop.sh -) -fn_test_result_fail -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.6 - restart" -echo -e "=================================" -echo -e "Description:" -echo -e "restart ${gamename}." -echo -e "Command: ./${gameservername} restart" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_restart.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.7 - restart - offline" -echo -e "=================================" -echo -e "Description:" -echo -e "restart ${gamename} while already stopped." -echo -e "Command: ./${gameservername} restart" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_restart.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "4.0 - Update Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "4.1 - update" -echo -e "=================================" -echo -e "Description:" -echo -e "check for updates." -echo -e "Command: ./${gameservername} update" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_update.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "4.2 - update - change buildid" -echo -e "=================================" -echo -e "Description:" -echo -e "change the buildid tricking SteamCMD to update." -echo -e "Command: ./jc2server update" -requiredstatus="STOPPED" -fn_setstatus -fn_print_info_nl "changed buildid to 0." -sed -i 's/[0-9]\+/0/' "${serverfiles}/steamapps/appmanifest_${appid}.acf" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_update.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "4.3 - update - change buildid - online" -echo -e "=================================" -echo -e "Description:" -echo -e "change the buildid tricking SteamCMD to update server while already running." -echo -e "Command: ./jc2server update" -requiredstatus="STARTED" -fn_setstatus -fn_print_info_nl "changed buildid to 0." -sed -i 's/[0-9]\+/0/' "${serverfiles}/steamapps/appmanifest_${appid}.acf" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_update.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "4.4 - update - remove appmanifest file" -echo -e "=================================" -echo -e "Description:" -echo -e "removing appmanifest file will cause script to repair." -echo -e "Command: ./jc2server update" -requiredstatus="STOPPED" -fn_setstatus -fn_print_info_nl "removed appmanifest_${appid}.acf." -rm --verbose "${serverfiles:?}/steamapps/appmanifest_${appid}.acf" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_update.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "4.5 - force-update" -echo -e "=================================" -echo -e "Description:" -echo -e "force-update bypassing update check." -echo -e "Command: ./jc2server force-update" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - forceupdate=1 - command_update.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "4.6 - force-update - online" -echo -e "=================================" -echo -e "Description:" -echo -e "force-update bypassing update check server while already running." -echo -e "Command: ./jc2server force-update" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - forceupdate=1 - command_update.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "4.7 - validate" -echo -e "=================================" -echo -e "Description:" -echo -e "validate server files." -echo -e "Command: ./jc2server validate" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_validate.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "4.8 - validate - online" -echo -e "=================================" -echo -e "Description:" -echo -e "validate server files while server already running." -echo -e "" -echo -e "Command: ./jc2server validate" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_validate.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "4.9 - update-lgsm" -echo -e "=================================" -echo -e "Description:" -echo -e "update LinuxGSM." -echo -e "" -echo -e "Command: ./jc2server update-lgam" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_update_linuxgsm.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "Inserting IP address" -echo -e "=================================" -echo -e "Description:" -echo -e "Inserting Travis IP in to config." -echo -e "Allows monitor to work" -if [ "$(${ipcommand}-o -4 addr | grep eth0)" ]; then - travisip=$(${ipcommand}-o -4 addr | grep eth0 | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | grep -v 127.0.0) -else - travisip=$(${ipcommand}-o -4 addr | grep ens | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | sort -u | grep -v 127.0.0) -fi -sed -i "/BindIP/c\BindIP = \"${travisip}\"," "${serverfiles}/config.lua" -echo -e "IP: ${travisip}" - -echo -e "" -echo -e "5.0 - Monitor Tests" -echo -e "==================================================================" -echo -e "" -info_game.sh -echo -e "Server IP - Port: ${ip}:${port}" -echo -e "Server IP - Query Port: ${ip}:${queryport}" - -echo -e "" -echo -e "5.1 - monitor - online" -echo -e "=================================" -echo -e "Description:" -echo -e "run monitor server while already running." -echo -e "Command: ./${gameservername} monitor" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_monitor.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "5.2 - monitor - offline - with lockfile" -echo -e "=================================" -echo -e "Description:" -echo -e "run monitor while server is offline with lockfile." -echo -e "Command: ./${gameservername} monitor" -requiredstatus="STOPPED" -fn_setstatus -fn_print_info_nl "creating lockfile." -date '+%s' > "${lockdir}/${selfname}.lock" -echo "${version}" >> "${lockdir}/${selfname}.lock" -echo "${port}" >> "${lockdir}/${selfname}.lock" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_monitor.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "5.3 - monitor - offline - no lockfile" -echo -e "=================================" -echo -e "Description:" -echo -e "run monitor while server is offline with no lockfile." -echo -e "Command: ./${gameservername} monitor" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_monitor.sh -) -fn_test_result_fail -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "5.4 - test-alert" -echo -e "=================================" -echo -e "Description:" -echo -e "run monitor while server is offline with no lockfile." -echo -e "Command: ./${gameservername} test-alert" -requiredstatus="STOPPED" -fn_setstatus -cp "${servercfgfullpath}" "config.lua" -sed -i 's/[0-9]\+/0/' "${servercfgfullpath}" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_test_alert.sh -) -fn_test_result_fail -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -fn_print_info_nl "Re-generating ${servercfg}." -cp -v "config.lua" "${servercfgfullpath}" -echo -e "=================================" - -echo -e "" -echo -e "6.0 - Details Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "6.1 - details" -echo -e "=================================" -echo -e "Description:" -echo -e "display details." -echo -e "Command: ./${gameservername} details" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_details.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "6.2 - postdetails" -echo -e "=================================" -echo -e "Description:" -echo -e "post details." -echo -e "Command: ./${gameservername} postdetails" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_postdetails.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "7.0 - Backup Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "7.1 - backup" -echo -e "=================================" -echo -e "Description:" -echo -e "run a backup." -echo -e "Command: ./${gameservername} backup" -requiredstatus="STARTED" -fn_setstatus -echo -e "test de-activated until issue #1839 fixed" -#(command_backup.sh) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "8.0 - Development Tools Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "8.1 - dev - detect glibc" -echo -e "=================================" -echo -e "Description:" -echo -e "detect glibc." -echo -e "Command: ./${gameservername} detect-glibc" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_detect_glibc.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "8.2 - dev - detect ldd" -echo -e "=================================" -echo -e "Description:" -echo -e "detect ldd." -echo -e "Command: ./${gameservername} detect-ldd" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_detect_ldd.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "8.3 - dev - detect deps" -echo -e "=================================" -echo -e "Description:" -echo -e "detect dependencies." -echo -e "Command: ./${gameservername} detect-deps" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_detect_deps.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "8.4 - dev - query-raw" -echo -e "=================================" -echo -e "Description:" -echo -e "raw query output." -echo -e "Command: ./${gameservername} query-raw" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_query_raw.sh -) -fn_test_result_na -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "9.0 - Sponsor" -echo -e "==================================================================" - -echo -e "" -echo -e "9.1 - sponsor" -echo -e "=================================" -echo -e "Description:" -echo -e "sponsor." -echo -e "Command: ./${gameservername} sponsor" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_sponsor.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "=================================" -echo -e "Server Tests - Complete!" -echo -e "Using: ${gamename}" -echo -e "=================================" -requiredstatus="STOPPED" -fn_setstatus -core_exit.sh diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh deleted file mode 100644 index 3a40e9aa5..000000000 --- a/tests/tests_mcserver.sh +++ /dev/null @@ -1,1231 +0,0 @@ -#!/bin/bash -# Project: Game Server Managers - LinuxGSM -# Author: Daniel Gibbs -# License: MIT License, Copyright (c) 2020 Daniel Gibbs -# Purpose: Travis CI Tests: Minecraft | Linux Game Server Management Script -# Contributors: https://linuxgsm.com/contrib -# Documentation: https://docs.linuxgsm.com -# Website: https://linuxgsm.com - -# DO NOT EDIT THIS FILE -# LinuxGSM configuration is no longer edited here -# To update your LinuxGSM config go to: -# lgsm/config-lgsm -# https://docs.linuxgsm.com/configuration/linuxgsm-config - -# Debugging -if [ -f ".dev-debug" ]; then - exec 5> dev-debug.log - BASH_XTRACEFD="5" - set -x -fi - -version="v23.5.3" -shortname="mc" -gameservername="mcserver" -commandname="CORE" -rootdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") -selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")") -sessionname=$(echo "${selfname}" | cut -f1 -d".") -lgsmdir="${rootdir}/lgsm" -logdir="${rootdir}/log" -lgsmlogdir="${logdir}/lgsm" -steamcmddir="${HOME}/.steam/steamcmd" -serverfiles="${rootdir}/serverfiles" -modulesdir="${lgsmdir}/modules" -tmpdir="${lgsmdir}/tmp" -datadir="${lgsmdir}/data" -lockdir="${lgsmdir}/lock" -serverlist="${datadir}/serverlist.csv" -serverlistmenu="${datadir}/serverlistmenu.csv" -configdir="${lgsmdir}/config-lgsm" -configdirserver="${configdir}/${gameservername}" -configdirdefault="${lgsmdir}/config-default" -userinput="${1}" - -# Allows for testing not on Travis CI. -# if using travis for tests -if [ -z "${TRAVIS}" ]; then - TRAVIS_BRANCH="develop" - TRAVIS_BUILD_DIR="${rootdir}" -fi -travistest="1" - -## GitHub Branch Select -# Allows for the use of different module files -# from a different repo and/or branch. -githubuser="GameServerManagers" -githubrepo="LinuxGSM" -githubbranch="${TRAVIS_BRANCH}" - -# Core module that is required first. -core_modules.sh() { - modulefile="${FUNCNAME[0]}" - fn_bootstrap_fetch_file_github "lgsm/modules" "core_modules.sh" "${modulesdir}" "chmodx" "run" "noforcedl" "nohash" -} - -# Bootstrap -# Fetches the core modules required before passed off to core_dl.sh. -fn_bootstrap_fetch_file() { - remote_fileurl="${1}" - remote_fileurl_backup="${2}" - remote_fileurl_name="${3}" - remote_fileurl_backup_name="${4}" - local_filedir="${5}" - local_filename="${6}" - chmodx="${7:-0}" - run="${8:-0}" - forcedl="${9:-0}" - md5="${10:-0}" - # Download file if missing or download forced. - if [ ! -f "${local_filedir}/${local_filename}" ] || [ "${forcedl}" == "forcedl" ]; then - # If backup fileurl exists include it. - if [ -n "${remote_fileurl_backup}" ]; then - # counter set to 0 to allow second try - counter=0 - remote_fileurls_array=(remote_fileurl remote_fileurl_backup) - else - # counter set to 1 to not allow second try - counter=1 - remote_fileurls_array=(remote_fileurl) - fi - - for remote_fileurl_array in "${remote_fileurls_array[@]}"; do - if [ "${remote_fileurl_array}" == "remote_fileurl" ]; then - fileurl="${remote_fileurl}" - fileurl_name="${remote_fileurl_name}" - elif [ "${remote_fileurl_array}" == "remote_fileurl_backup" ]; then - fileurl="${remote_fileurl_backup}" - fileurl_name="${remote_fileurl_backup_name}" - fi - counter=$((counter + 1)) - if [ ! -d "${local_filedir}" ]; then - mkdir -p "${local_filedir}" - fi - # Trap will remove part downloaded files if canceled. - trap fn_fetch_trap INT - # Larger files show a progress bar. - - echo -en "fetching ${fileurl_name} ${local_filename}...\c" - curlcmd=$(curl -s --fail -L -o "${local_filedir}/${local_filename}" "${fileurl}" 2>&1) - - local exitcode=$? - # Download will fail if downloads a html file. - if [ -f "${local_filedir}/${local_filename}" ]; then - if [ -n "$(head "${local_filedir}/${local_filename}" | grep "DOCTYPE")" ]; then - rm -f "${local_filedir:?}/${local_filename:?}" - local exitcode=2 - fi - fi - - # On first try will error. On second try will fail. - if [ "${exitcode}" != 0 ]; then - if [ ${counter} -ge 2 ]; then - echo -e "FAIL" - if [ -f "${lgsmlog}" ]; then - fn_script_log_fail "Downloading ${local_filename}" - fn_script_log_fail "${fileurl}" - fi - core_exit.sh - else - echo -e "ERROR" - if [ -f "${lgsmlog}" ]; then - fn_script_log_error "Downloading ${local_filename}" - fn_script_log_error "${fileurl}" - fi - fi - - else - echo -en "OK" - sleep 0.3 - echo -en "\033[2K\\r" - if [ -f "${lgsmlog}" ]; then - fn_script_log_pass "Downloading ${local_filename}" - fi - - # Make file executable if chmodx is set. - if [ "${chmodx}" == "chmodx" ]; then - chmod +x "${local_filedir}/${local_filename}" - fi - - # Remove trap. - trap - INT - - break - fi - done - fi - - if [ -f "${local_filedir}/${local_filename}" ]; then - # Execute file if run is set. - if [ "${run}" == "run" ]; then - # shellcheck source=/dev/null - source "${local_filedir}/${local_filename}" - fi - fi -} - -fn_bootstrap_fetch_file_github() { - github_file_url_dir="${1}" - github_file_url_name="${2}" - # If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork. - if [ "${githubbranch}" == "master" ] && [ "${githubuser}" == "GameServerManagers" ] && [ "${commandname}" != "UPDATE-LGSM" ]; then - remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}" - remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}" - else - remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${github_file_url_name}" - remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/${github_file_url_dir}/${github_file_url_name}" - fi - remote_fileurl_name="GitHub" - remote_fileurl_backup_name="Bitbucket" - local_filedir="${3}" - local_filename="${github_file_url_name}" - chmodx="${4:-0}" - run="${5:-0}" - forcedl="${6:-0}" - md5="${7:-0}" - # Passes vars to the file download module. - fn_bootstrap_fetch_file "${remote_fileurl}" "${remote_fileurl_backup}" "${remote_fileurl_name}" "${remote_fileurl_backup_name}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${md5}" -} - -# Installer menu. - -fn_print_center() { - columns=$(tput cols) - line="$*" - printf "%*s\n" $(((${#line} + columns) / 2)) "${line}" -} - -fn_print_horizontal() { - printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' "=" -} - -# Bash menu. -fn_install_menu_bash() { - local resultvar=$1 - title=$2 - caption=$3 - options=$4 - fn_print_horizontal - fn_print_center "${title}" - fn_print_center "${caption}" - fn_print_horizontal - menu_options=() - while read -r line || [[ -n "${line}" ]]; do - var=$(echo -e "${line}" | awk -F "," '{print $2 " - " $3}') - menu_options+=("${var}") - done < "${options}" - menu_options+=("Cancel") - select option in "${menu_options[@]}"; do - if [ "${option}" ] && [ "${option}" != "Cancel" ]; then - eval "$resultvar=\"${option/%\ */}\"" - fi - break - done -} - -# Whiptail/Dialog menu. -fn_install_menu_whiptail() { - local menucmd=$1 - local resultvar=$2 - title=$3 - caption=$4 - options=$5 - height=${6:-40} - width=${7:-80} - menuheight=${8:-30} - IFS="," - menu_options=() - while read -r line; do - key=$(echo -e "${line}" | awk -F "," '{print $3}') - val=$(echo -e "${line}" | awk -F "," '{print $2}') - menu_options+=("${val//\"/}" "${key//\"/}") - done < "${options}" - OPTION=$(${menucmd} --title "${title}" --menu "${caption}" "${height}" "${width}" "${menuheight}" "${menu_options[@]}" 3>&1 1>&2 2>&3) - if [ $? == 0 ]; then - eval "$resultvar=\"${OPTION}\"" - else - eval "$resultvar=" - fi -} - -# Menu selector. -fn_install_menu() { - local resultvar=$1 - local selection="" - title=$2 - caption=$3 - options=$4 - # Get menu command. - for menucmd in whiptail dialog bash; do - if [ "$(command -v "${menucmd}")" ]; then - menucmd=$(command -v "${menucmd}") - break - fi - done - case "$(basename "${menucmd}")" in - whiptail | dialog) - fn_install_menu_whiptail "${menucmd}" selection "${title}" "${caption}" "${options}" 40 80 30 - ;; - *) - fn_install_menu_bash selection "${title}" "${caption}" "${options}" - ;; - esac - eval "$resultvar=\"${selection}\"" -} - -# Gets server info from serverlist.csv and puts in to array. -fn_server_info() { - IFS="," - server_info_array=($(grep -aw "${userinput}" "${serverlist}")) - shortname="${server_info_array[0]}" # csgo - gameservername="${server_info_array[1]}" # csgoserver - gamename="${server_info_array[2]}" # Counter Strike: Global Offensive -} - -fn_install_getopt() { - userinput="empty" - echo -e "Usage: $0 [option]" - echo -e "" - echo -e "Installer - Linux Game Server Managers - Version ${version}" - echo -e "https://linuxgsm.com" - echo -e "" - echo -e "Commands" - echo -e "install\t\t| Select server to install." - echo -e "servername\t| Enter name of game server to install. e.g $0 csgoserver." - echo -e "list\t\t| List all servers available for install." - exit -} - -fn_install_file() { - local_filename="${gameservername}" - if [ -e "${local_filename}" ]; then - i=2 - while [ -e "${local_filename}-${i}" ]; do - ((i++)) - done - local_filename="${local_filename}-${i}" - fi - cp -R "${selfname}" "${local_filename}" - sed -i -e "s/shortname=\"core\"/shortname=\"${shortname}\"/g" "${local_filename}" - sed -i -e "s/gameservername=\"core\"/gameservername=\"${gameservername}\"/g" "${local_filename}" - echo -e "Installed ${gamename} server as ${local_filename}" - echo -e "" - if [ ! -d "${serverfiles}" ]; then - echo -e "./${local_filename} install" - else - echo -e "Remember to check server ports" - echo -e "./${local_filename} details" - fi - echo -e "" - exit -} - -# Prevent LinuxGSM from running as root. Except if doing a dependency install. -if [ "$(whoami)" == "root" ]; then - if [ "${userinput}" == "install" ] || [ "${userinput}" == "auto-install" ] || [ "${userinput}" == "i" ] || [ "${userinput}" == "ai" ]; then - if [ "${shortname}" == "core" ]; then - echo -e "[ FAIL ] Do NOT run this script as root!" - exit 1 - fi - elif [ ! -f "${modulesdir}/core_modules.sh" ] || [ ! -f "${modulesdir}/check_root.sh" ] || [ ! -f "${modulesdir}/core_messages.sh" ]; then - echo -e "[ FAIL ] Do NOT run this script as root!" - exit 1 - else - core_modules.sh - check_root.sh - fi -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" "nohash" - if [ ! -f "${serverlist}" ]; then - echo -e "[ FAIL ] serverlist.csv could not be loaded." - exit 1 - fi - - if [ "${userinput}" == "list" ] || [ "${userinput}" == "l" ]; then - { - tail -n +2 "${serverlist}" | awk -F "," '{print $2 "\t" $3}' - } | column -s $'\t' -t | more - exit - elif [ "${userinput}" == "install" ] || [ "${userinput}" == "i" ]; then - tail -n +2 "${serverlist}" | awk -F "," '{print $1 "," $2 "," $3}' > "${serverlistmenu}" - fn_install_menu result "LinuxGSM" "Select game server to install." "${serverlistmenu}" - userinput="${result}" - fn_server_info - if [ "${result}" == "${gameservername}" ]; then - fn_install_file - elif [ "${result}" == "" ]; then - echo -e "Install canceled" - else - echo -e "[ FAIL ] menu result does not match gameservername" - echo -e "result: ${result}" - echo -e "gameservername: ${gameservername}" - fi - elif [ "${userinput}" ]; then - fn_server_info - if [ "${userinput}" == "${gameservername}" ] || [ "${userinput}" == "${gamename}" ] || [ "${userinput}" == "${shortname}" ]; then - fn_install_file - else - echo -e "[ FAIL ] Unknown game server" - fi - else - fn_install_getopt - fi - -# LinuxGSM server mode. -else - core_modules.sh - if [ "${shortname}" != "core-dep" ]; then - # Load LinuxGSM configs. - # These are required to get all the default variables for the specific server. - # Load the default config. If missing download it. If changed reload it. - if [ ! -f "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" ]; then - mkdir -p "${configdirdefault}/config-lgsm/${gameservername}" - fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforcedl" "nohash" - fi - if [ ! -f "${configdirserver}/_default.cfg" ]; then - mkdir -p "${configdirserver}" - echo -en "copying _default.cfg...\c" - cp -R "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg" - exitcode=$? - if [ "${exitcode}" != 0 ]; then - echo -e "FAIL" - exit 1 - else - echo -e "OK" - fi - else - module_file_diff=$(diff -q "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg") - if [ "${module_file_diff}" != "" ]; then - fn_print_warn_nl "_default.cfg has been altered. reloading config." - echo -en "copying _default.cfg...\c" - cp -R "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg" - exitcode=$? - if [ "${exitcode}" != 0 ]; then - echo -e "FAIL" - exit 1 - else - echo -e "OK" - fi - fi - fi - # shellcheck source=/dev/null - source "${configdirserver}/_default.cfg" - # Load the common.cfg config. If missing download it. - if [ ! -f "${configdirserver}/common.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash" - # shellcheck source=/dev/null - source "${configdirserver}/common.cfg" - else - # shellcheck source=/dev/null - source "${configdirserver}/common.cfg" - fi - # Load the secrets-common.cfg config. If missing download it. - if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash" - # shellcheck source=/dev/null - source "${configdirserver}/secrets-common.cfg" - else - # shellcheck source=/dev/null - source "${configdirserver}/secrets-common.cfg" - fi - # Load the instance.cfg config. If missing download it. - if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash" - # shellcheck source=/dev/null - source "${configdirserver}/${selfname}.cfg" - else - # shellcheck source=/dev/null - source "${configdirserver}/${selfname}.cfg" - fi - # Load the secrets-instance.cfg config. If missing download it. - if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash" - # shellcheck source=/dev/null - source "${configdirserver}/secrets-${selfname}.cfg" - else - # shellcheck source=/dev/null - source "${configdirserver}/secrets-${selfname}.cfg" - fi - - # Load the linuxgsm.sh in to tmpdir. If missing download it. - if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then - fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nohash" - fi - fi - # Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off. - fn_ansi_loader - # Prevents running of core_exit.sh for Travis-CI. - if [ "${travistest}" != "1" ]; then - getopt=$1 - core_getopt.sh - fi -fi - -fn_currentstatus_tmux() { - check_status.sh - if [ "${status}" != "0" ]; then - currentstatus="STARTED" - else - currentstatus="STOPPED" - fi -} - -fn_setstatus() { - fn_currentstatus_tmux - echo"" - echo -e "Required status: ${requiredstatus}" - counter=0 - echo -e "Current status: ${currentstatus}" - while [ "${requiredstatus}" != "${currentstatus}" ]; do - counter=$((counter + 1)) - fn_currentstatus_tmux - echo -en "New status: ${currentstatus}\\r" - - if [ "${requiredstatus}" == "STARTED" ]; then - (command_start.sh > /dev/null 2>&1) - else - (command_stop.sh > /dev/null 2>&1) - fi - if [ "${counter}" -gt "5" ]; then - currentstatus="FAIL" - echo -e "Current status: ${currentstatus}" - echo -e "" - echo -e "Unable to start or stop server." - exit 1 - fi - done - echo -en "New status: ${currentstatus}\\r" - echo -e "\n" - echo -e "Test starting:" - echo -e "" -} - -# End of every test will expect the result to either pass or fail -# If the script does not do as intended the whole test will fail -# if expecting a pass -fn_test_result_pass() { - if [ $? != 0 ]; then - echo -e "=================================" - echo -e "Expected result: PASS" - echo -e "Actual result: FAIL" - fn_print_fail_nl "TEST FAILED" - exitcode=1 - core_exit.sh - else - echo -e "=================================" - echo -e "Expected result: PASS" - echo -e "Actual result: PASS" - fn_print_ok_nl "TEST PASSED" - echo -e "" - fi -} - -# if expecting a fail -fn_test_result_fail() { - if [ $? == 0 ]; then - echo -e "=================================" - echo -e "Expected result: FAIL" - echo -e "Actual result: PASS" - fn_print_fail_nl "TEST FAILED" - exitcode=1 - core_exit.sh - else - echo -e "=================================" - echo -e "Expected result: FAIL" - echo -e "Actual result: FAIL" - fn_print_ok_nl "TEST PASSED" - echo -e "" - fi -} - -# test result n/a -fn_test_result_na() { - echo -e "=================================" - echo -e "Expected result: N/A" - echo -e "Actual result: N/A" - fn_print_fail_nl "TEST N/A" -} - -sleeptime="0" - -echo -e "=================================" -echo -e "Travis CI Tests" -echo -e "Linux Game Server Manager" -echo -e "by Daniel Gibbs" -echo -e "Contributors: http://goo.gl/qLmitD" -echo -e "https://linuxgsm.com" -echo -e "=================================" -echo -e "" -echo -e "=================================" -echo -e "Server Tests" -echo -e "Using: ${gamename}" -echo -e "Testing Branch: ${TRAVIS_BRANCH}" -echo -e "=================================" -echo -e "" -echo -e "Tests Summary" -echo -e "=================================" -echo -e "0.0 - Pre-test Tasks" -echo -e "0.1 - Create log dir's" -echo -e "0.2 - Enable dev-debug" -echo -e "" -echo -e "1.0 - Pre-install tests" -echo -e "1.1 - start - no files" -echo -e "1.2 - getopt" -echo -e "1.3 - getopt with incorrect args" -echo -e "" -echo -e "2.0 - Installation" -echo -e "2.1 - install" -echo -e "" -echo -e "3.0 - Start/Stop/Restart Tests" -echo -e "3.1 - start" -echo -e "3.2 - start - online" -echo -e "3.3 - start - updateonstart" -echo -e "3.4 - stop" -echo -e "3.5 - stop - offline" -echo -e "3.6 - restart" -echo -e "3.7 - restart - offline" -echo -e "" -echo -e "4.0 - Update Tests" -echo -e "4.1 - update" -echo -e "4.2 - update-lgsm" -echo -e "" -echo -e "5.0 - Monitor Tests" -echo -e "5.1 - monitor - online" -echo -e "5.2 - monitor - offline - with lockfile" -echo -e "5.3 - monitor - offline - no lockfile" -echo -e "5.4 - test-alert" -echo -e "" -echo -e "6.0 - Details Tests" -echo -e "6.1 - details" -echo -e "6.2 - postdetails" -echo -e "" -echo -e "7.0 - Backup Tests" -echo -e "7.1 - backup" -echo -e "" -echo -e "8.0 - Development Tools Tests" -echo -e "8.1 - dev - detect glibc" -echo -e "8.2 - dev - detect ldd" -echo -e "8.3 - dev - detect deps" -echo -e "8.4 - dev - query-raw" -echo -e "" -echo -e "9.0 - Sponsor" -echo -e "9.1 - sponsor" - -echo -e "" -echo -e "0.0 - Pre-test Tasks" -echo -e "==================================================================" -echo -e "Description:" -echo -e "Create log dir's" -echo -e "" - -echo -e "" -echo -e "0.1 - Create log dir's" -echo -e "=================================" -echo -e "" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - install_logs.sh -) -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "0.2 - Enable dev-debug" -echo -e "=================================" -echo -e "Description:" -echo -e "Enable dev-debug" -echo -e "" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_debug.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "1.0 - Pre-install tests" -echo -e "==================================================================" -echo -e "" - -echo -e "1.1 - start - no files" -echo -e "=================================" -echo -e "Description:" -echo -e "test script reaction to missing server files." -echo -e "Command: ./${gameservername} start" -echo -e "" -# Allows for testing not on Travis CI -if [ -z "${TRAVIS}" ]; then - ( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_start.sh - ) - fn_test_result_fail -else - echo -e "Test bypassed" -fi - -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "1.2 - getopt" -echo -e "=================================" -echo -e "Description:" -echo -e "displaying options messages." -echo -e "Command: ./${gameservername}" -echo -e "" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - core_getopt.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "1.3 - getopt with incorrect args" -echo -e "=================================" -echo -e "Description:" -echo -e "displaying options messages." -echo -e "Command: ./${gameservername} abc123" -echo -e "" -getopt="abc123" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - core_getopt.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "2.0 - Installation" -echo -e "==================================================================" - -echo -e "" -echo -e "2.1 - install" -echo -e "=================================" -echo -e "Description:" -echo -e "install ${gamename} server." -echo -e "Command: ./${gameservername} auto-install" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - fn_autoinstall -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.0 - Start/Stop/Restart Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "3.1 - start" -echo -e "=================================" -echo -e "Description:" -echo -e "start ${gamename} server." -echo -e "Command: ./${gameservername} start" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_start.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.2 - start - online" -echo -e "=================================" -echo -e "Description:" -echo -e "start ${gamename} server while already running." -echo -e "Command: ./${gameservername} start" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_start.sh -) -fn_test_result_fail -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.3 - start - updateonstart" -echo -e "=================================" -echo -e "Description:" -echo -e "will update server on start." -echo -e "Command: ./${gameservername} start" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - updateonstart="on" - command_start.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' -echo -e "" -echo -e "30s Pause" -echo -e "=================================" -echo -e "Description:" -echo -e "give time for server to fully start." -echo -e "Command: sleep 30" -requiredstatus="STARTED" -fn_setstatus -sleep 30 - -echo -e "" -echo -e "3.4 - stop" -echo -e "=================================" -echo -e "Description:" -echo -e "stop ${gamename} server." -echo -e "Command: ./${gameservername} stop" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_stop.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.5 - stop - offline" -echo -e "=================================" -echo -e "Description:" -echo -e "stop ${gamename} server while already stopped." -echo -e "Command: ./${gameservername} stop" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_stop.sh -) -fn_test_result_fail -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.6 - restart" -echo -e "=================================" -echo -e "Description:" -echo -e "restart ${gamename}." -echo -e "Command: ./${gameservername} restart" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_restart.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.7 - restart - offline" -echo -e "=================================" -echo -e "Description:" -echo -e "restart ${gamename} while already stopped." -echo -e "Command: ./${gameservername} restart" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_restart.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "4.0 - Update Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "4.1 - update" -echo -e "=================================" -echo -e "Description:" -echo -e "check for updates." -echo -e "Command: ./${gameservername} update" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_update.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "4.2 - update-lgsm" -echo -e "=================================" -echo -e "Description:" -echo -e "update LinuxGSM." -echo -e "" -echo -e "Command: ./jc2server update-lgam" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_update_linuxgsm.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "Inserting IP address" -echo -e "=================================" -echo -e "Description:" -echo -e "Inserting Travis IP in to config." -echo -e "Allows monitor to work" -if [ "$(${ipcommand}-o -4 addr | grep eth0)" ]; then - travisip=$(${ipcommand}-o -4 addr | grep eth0 | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | grep -v 127.0.0) -else - travisip=$(${ipcommand}-o -4 addr | grep ens | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | sort -u | grep -v 127.0.0) -fi -sed -i "/server-ip=/c\server-ip=${travisip}" "${serverfiles}/server.properties" -echo -e "IP: ${travisip}" - -echo -e "" -echo -e "5.0 - Monitor Tests" -echo -e "==================================================================" -echo -e "" -info_game.sh -echo -e "Server IP - Port: ${ip}:${port}" -echo -e "Server IP - Query Port: ${ip}:${queryport}" - -echo -e "" -echo -e "30s Pause" -echo -e "=================================" -echo -e "Description:" -echo -e "give time for server to fully start." -echo -e "Command: sleep 30" -requiredstatus="STARTED" -fn_setstatus -sleep 30 - -echo -e "" -echo -e "5.1 - monitor - online" -echo -e "=================================" -echo -e "Description:" -echo -e "run monitor server while already running." -echo -e "Command: ./${gameservername} monitor" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_monitor.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "5.2 - monitor - offline - with lockfile" -echo -e "=================================" -echo -e "Description:" -echo -e "run monitor while server is offline with lockfile." -echo -e "Command: ./${gameservername} monitor" -requiredstatus="STOPPED" -fn_setstatus -fn_print_info_nl "creating lockfile." -date '+%s' > "${lockdir}/${selfname}.lock" -echo "${version}" >> "${lockdir}/${selfname}.lock" -echo "${port}" >> "${lockdir}/${selfname}.lock" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_monitor.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "5.3 - monitor - offline - no lockfile" -echo -e "=================================" -echo -e "Description:" -echo -e "run monitor while server is offline with no lockfile." -echo -e "Command: ./${gameservername} monitor" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_monitor.sh -) -fn_test_result_fail -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "5.4 - test-alert" -echo -e "=================================" -echo -e "Description:" -echo -e "run monitor while server is offline with no lockfile." -echo -e "Command: ./${gameservername} test-alert" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_test_alert.sh -) -fn_test_result_fail -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "6.0 - Details Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "6.1 - details" -echo -e "=================================" -echo -e "Description:" -echo -e "display details." -echo -e "Command: ./${gameservername} details" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_details.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "6.2 - postdetails" -echo -e "=================================" -echo -e "Description:" -echo -e "post details." -echo -e "Command: ./${gameservername} postdetails" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_postdetails.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "7.0 - Backup Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "7.1 - backup" -echo -e "=================================" -echo -e "Description:" -echo -e "run a backup." -echo -e "Command: ./${gameservername} backup" -requiredstatus="STARTED" -fn_setstatus -echo -e "test de-activated until issue #1839 fixed" -#(command_backup.sh) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "8.0 - Development Tools Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "8.1 - dev - detect glibc" -echo -e "=================================" -echo -e "Description:" -echo -e "detect glibc." -echo -e "Command: ./${gameservername} detect-glibc" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_detect_glibc.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "8.2 - dev - detect ldd" -echo -e "=================================" -echo -e "Description:" -echo -e "detect ldd." -echo -e "Command: ./${gameservername} detect-ldd" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_detect_ldd.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "8.3 - dev - detect deps" -echo -e "=================================" -echo -e "Description:" -echo -e "detect dependencies." -echo -e "Command: ./${gameservername} detect-deps" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_detect_deps.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "Inserting IP address" -echo -e "=================================" -echo -e "Description:" -echo -e "Inserting Travis IP in to config." -echo -e "Allows monitor to work" -if [ "$(${ipcommand}-o -4 addr | grep eth0)" ]; then - travisip=$(${ipcommand}-o -4 addr | grep eth0 | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | grep -v 127.0.0) -else - travisip=$(${ipcommand}-o -4 addr | grep ens | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | sort -u | grep -v 127.0.0) -fi -sed -i "/server-ip=/c\server-ip=${travisip}" "${serverfiles}/server.properties" -echo -e "IP: ${travisip}" - -echo -e "" -echo -e "8.4 - dev - query-raw" -echo -e "=================================" -echo -e "Description:" -echo -e "raw query output." -echo -e "Command: ./${gameservername} query-raw" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_query_raw.sh -) -fn_test_result_na -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "9.0 - Sponsor" -echo -e "==================================================================" - -echo -e "" -echo -e "9.1 - sponsor" -echo -e "=================================" -echo -e "Description:" -echo -e "sponsor." -echo -e "Command: ./${gameservername} sponsor" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_sponsor.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "=================================" -echo -e "Server Tests - Complete!" -echo -e "Using: ${gamename}" -echo -e "=================================" -requiredstatus="STOPPED" -fn_setstatus - -core_exit.sh diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh deleted file mode 100644 index 3fcb8ae24..000000000 --- a/tests/tests_ts3server.sh +++ /dev/null @@ -1,1184 +0,0 @@ -#!/bin/bash -# Project: Game Server Managers - LinuxGSM -# Author: Daniel Gibbs -# License: MIT License, Copyright (c) 2020 Daniel Gibbs -# Purpose: Travis CI Tests: Teamspeak 3 | Linux Game Server Management Script -# Contributors: https://linuxgsm.com/contrib -# Documentation: https://docs.linuxgsm.com -# Website: https://linuxgsm.com - -# DO NOT EDIT THIS FILE -# LinuxGSM configuration is no longer edited here -# To update your LinuxGSM config go to: -# lgsm/config-lgsm -# https://docs.linuxgsm.com/configuration/linuxgsm-config - -# Debugging -if [ -f ".dev-debug" ]; then - exec 5> dev-debug.log - BASH_XTRACEFD="5" - set -x -fi - -version="v23.5.3" -shortname="ts3" -gameservername="ts3server" -commandname="CORE" -rootdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") -selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")") -sessionname=$(echo "${selfname}" | cut -f1 -d".") -lgsmdir="${rootdir}/lgsm" -logdir="${rootdir}/log" -lgsmlogdir="${logdir}/lgsm" -steamcmddir="${HOME}/.steam/steamcmd" -serverfiles="${rootdir}/serverfiles" -modulesdir="${lgsmdir}/modules" -tmpdir="${lgsmdir}/tmp" -datadir="${lgsmdir}/data" -lockdir="${lgsmdir}/lock" -serverlist="${datadir}/serverlist.csv" -serverlistmenu="${datadir}/serverlistmenu.csv" -configdir="${lgsmdir}/config-lgsm" -configdirserver="${configdir}/${gameservername}" -configdirdefault="${lgsmdir}/config-default" -userinput="${1}" - -# Allows for testing not on Travis CI. -# if using travis for tests -if [ -z "${TRAVIS}" ]; then - TRAVIS_BRANCH="develop" - TRAVIS_BUILD_DIR="${rootdir}" -fi -travistest="1" - -## GitHub Branch Select -# Allows for the use of different module files -# from a different repo and/or branch. -githubuser="GameServerManagers" -githubrepo="LinuxGSM" -githubbranch="${TRAVIS_BRANCH}" - -# Core module that is required first. -core_modules.sh() { - modulefile="${FUNCNAME[0]}" - fn_bootstrap_fetch_file_github "lgsm/modules" "core_modules.sh" "${modulesdir}" "chmodx" "run" "noforcedl" "nohash" -} - -# Bootstrap -# Fetches the core modules required before passed off to core_dl.sh. -fn_bootstrap_fetch_file() { - remote_fileurl="${1}" - remote_fileurl_backup="${2}" - remote_fileurl_name="${3}" - remote_fileurl_backup_name="${4}" - local_filedir="${5}" - local_filename="${6}" - chmodx="${7:-0}" - run="${8:-0}" - forcedl="${9:-0}" - md5="${10:-0}" - # Download file if missing or download forced. - if [ ! -f "${local_filedir}/${local_filename}" ] || [ "${forcedl}" == "forcedl" ]; then - # If backup fileurl exists include it. - if [ -n "${remote_fileurl_backup}" ]; then - # counter set to 0 to allow second try - counter=0 - remote_fileurls_array=(remote_fileurl remote_fileurl_backup) - else - # counter set to 1 to not allow second try - counter=1 - remote_fileurls_array=(remote_fileurl) - fi - - for remote_fileurl_array in "${remote_fileurls_array[@]}"; do - if [ "${remote_fileurl_array}" == "remote_fileurl" ]; then - fileurl="${remote_fileurl}" - fileurl_name="${remote_fileurl_name}" - elif [ "${remote_fileurl_array}" == "remote_fileurl_backup" ]; then - fileurl="${remote_fileurl_backup}" - fileurl_name="${remote_fileurl_backup_name}" - fi - counter=$((counter + 1)) - if [ ! -d "${local_filedir}" ]; then - mkdir -p "${local_filedir}" - fi - # Trap will remove part downloaded files if canceled. - trap fn_fetch_trap INT - # Larger files show a progress bar. - - echo -en "fetching ${fileurl_name} ${local_filename}...\c" - curlcmd=$(curl -s --fail -L -o "${local_filedir}/${local_filename}" "${fileurl}" 2>&1) - - local exitcode=$? - # Download will fail if downloads a html file. - if [ -f "${local_filedir}/${local_filename}" ]; then - if [ -n "$(head "${local_filedir}/${local_filename}" | grep "DOCTYPE")" ]; then - rm -f "${local_filedir:?}/${local_filename:?}" - local exitcode=2 - fi - fi - - # On first try will error. On second try will fail. - if [ "${exitcode}" != 0 ]; then - if [ ${counter} -ge 2 ]; then - echo -e "FAIL" - if [ -f "${lgsmlog}" ]; then - fn_script_log_fail "Downloading ${local_filename}" - fn_script_log_fail "${fileurl}" - fi - core_exit.sh - else - echo -e "ERROR" - if [ -f "${lgsmlog}" ]; then - fn_script_log_error "Downloading ${local_filename}" - fn_script_log_error "${fileurl}" - fi - fi - - else - echo -en "OK" - sleep 0.3 - echo -en "\033[2K\\r" - if [ -f "${lgsmlog}" ]; then - fn_script_log_pass "Downloading ${local_filename}" - fi - - # Make file executable if chmodx is set. - if [ "${chmodx}" == "chmodx" ]; then - chmod +x "${local_filedir}/${local_filename}" - fi - - # Remove trap. - trap - INT - - break - fi - done - fi - - if [ -f "${local_filedir}/${local_filename}" ]; then - # Execute file if run is set. - if [ "${run}" == "run" ]; then - # shellcheck source=/dev/null - source "${local_filedir}/${local_filename}" - fi - fi -} - -fn_bootstrap_fetch_file_github() { - github_file_url_dir="${1}" - github_file_url_name="${2}" - # If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork. - if [ "${githubbranch}" == "master" ] && [ "${githubuser}" == "GameServerManagers" ] && [ "${commandname}" != "UPDATE-LGSM" ]; then - remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}" - remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}" - else - remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${github_file_url_name}" - remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/${github_file_url_dir}/${github_file_url_name}" - fi - remote_fileurl_name="GitHub" - remote_fileurl_backup_name="Bitbucket" - local_filedir="${3}" - local_filename="${github_file_url_name}" - chmodx="${4:-0}" - run="${5:-0}" - forcedl="${6:-0}" - md5="${7:-0}" - # Passes vars to the file download module. - fn_bootstrap_fetch_file "${remote_fileurl}" "${remote_fileurl_backup}" "${remote_fileurl_name}" "${remote_fileurl_backup_name}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${md5}" -} - -# Installer menu. - -fn_print_center() { - columns=$(tput cols) - line="$*" - printf "%*s\n" $(((${#line} + columns) / 2)) "${line}" -} - -fn_print_horizontal() { - printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' "=" -} - -# Bash menu. -fn_install_menu_bash() { - local resultvar=$1 - title=$2 - caption=$3 - options=$4 - fn_print_horizontal - fn_print_center "${title}" - fn_print_center "${caption}" - fn_print_horizontal - menu_options=() - while read -r line || [[ -n "${line}" ]]; do - var=$(echo -e "${line}" | awk -F "," '{print $2 " - " $3}') - menu_options+=("${var}") - done < "${options}" - menu_options+=("Cancel") - select option in "${menu_options[@]}"; do - if [ "${option}" ] && [ "${option}" != "Cancel" ]; then - eval "$resultvar=\"${option/%\ */}\"" - fi - break - done -} - -# Whiptail/Dialog menu. -fn_install_menu_whiptail() { - local menucmd=$1 - local resultvar=$2 - title=$3 - caption=$4 - options=$5 - height=${6:-40} - width=${7:-80} - menuheight=${8:-30} - IFS="," - menu_options=() - while read -r line; do - key=$(echo -e "${line}" | awk -F "," '{print $3}') - val=$(echo -e "${line}" | awk -F "," '{print $2}') - menu_options+=("${val//\"/}" "${key//\"/}") - done < "${options}" - OPTION=$(${menucmd} --title "${title}" --menu "${caption}" "${height}" "${width}" "${menuheight}" "${menu_options[@]}" 3>&1 1>&2 2>&3) - if [ $? == 0 ]; then - eval "$resultvar=\"${OPTION}\"" - else - eval "$resultvar=" - fi -} - -# Menu selector. -fn_install_menu() { - local resultvar=$1 - local selection="" - title=$2 - caption=$3 - options=$4 - # Get menu command. - for menucmd in whiptail dialog bash; do - if [ "$(command -v "${menucmd}")" ]; then - menucmd=$(command -v "${menucmd}") - break - fi - done - case "$(basename "${menucmd}")" in - whiptail | dialog) - fn_install_menu_whiptail "${menucmd}" selection "${title}" "${caption}" "${options}" 40 80 30 - ;; - *) - fn_install_menu_bash selection "${title}" "${caption}" "${options}" - ;; - esac - eval "$resultvar=\"${selection}\"" -} - -# Gets server info from serverlist.csv and puts in to array. -fn_server_info() { - IFS="," - server_info_array=($(grep -aw "${userinput}" "${serverlist}")) - shortname="${server_info_array[0]}" # csgo - gameservername="${server_info_array[1]}" # csgoserver - gamename="${server_info_array[2]}" # Counter Strike: Global Offensive -} - -fn_install_getopt() { - userinput="empty" - echo -e "Usage: $0 [option]" - echo -e "" - echo -e "Installer - Linux Game Server Managers - Version ${version}" - echo -e "https://linuxgsm.com" - echo -e "" - echo -e "Commands" - echo -e "install\t\t| Select server to install." - echo -e "servername\t| Enter name of game server to install. e.g $0 csgoserver." - echo -e "list\t\t| List all servers available for install." - exit -} - -fn_install_file() { - local_filename="${gameservername}" - if [ -e "${local_filename}" ]; then - i=2 - while [ -e "${local_filename}-${i}" ]; do - ((i++)) - done - local_filename="${local_filename}-${i}" - fi - cp -R "${selfname}" "${local_filename}" - sed -i -e "s/shortname=\"core\"/shortname=\"${shortname}\"/g" "${local_filename}" - sed -i -e "s/gameservername=\"core\"/gameservername=\"${gameservername}\"/g" "${local_filename}" - echo -e "Installed ${gamename} server as ${local_filename}" - echo -e "" - if [ ! -d "${serverfiles}" ]; then - echo -e "./${local_filename} install" - else - echo -e "Remember to check server ports" - echo -e "./${local_filename} details" - fi - echo -e "" - exit -} - -# Prevent LinuxGSM from running as root. Except if doing a dependency install. -if [ "$(whoami)" == "root" ]; then - if [ "${userinput}" == "install" ] || [ "${userinput}" == "auto-install" ] || [ "${userinput}" == "i" ] || [ "${userinput}" == "ai" ]; then - if [ "${shortname}" == "core" ]; then - echo -e "[ FAIL ] Do NOT run this script as root!" - exit 1 - fi - elif [ ! -f "${modulesdir}/core_modules.sh" ] || [ ! -f "${modulesdir}/check_root.sh" ] || [ ! -f "${modulesdir}/core_messages.sh" ]; then - echo -e "[ FAIL ] Do NOT run this script as root!" - exit 1 - else - core_modules.sh - check_root.sh - fi -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" "nohash" - if [ ! -f "${serverlist}" ]; then - echo -e "[ FAIL ] serverlist.csv could not be loaded." - exit 1 - fi - - if [ "${userinput}" == "list" ] || [ "${userinput}" == "l" ]; then - { - tail -n +2 "${serverlist}" | awk -F "," '{print $2 "\t" $3}' - } | column -s $'\t' -t | more - exit - elif [ "${userinput}" == "install" ] || [ "${userinput}" == "i" ]; then - tail -n +2 "${serverlist}" | awk -F "," '{print $1 "," $2 "," $3}' > "${serverlistmenu}" - fn_install_menu result "LinuxGSM" "Select game server to install." "${serverlistmenu}" - userinput="${result}" - fn_server_info - if [ "${result}" == "${gameservername}" ]; then - fn_install_file - elif [ "${result}" == "" ]; then - echo -e "Install canceled" - else - echo -e "[ FAIL ] menu result does not match gameservername" - echo -e "result: ${result}" - echo -e "gameservername: ${gameservername}" - fi - elif [ "${userinput}" ]; then - fn_server_info - if [ "${userinput}" == "${gameservername}" ] || [ "${userinput}" == "${gamename}" ] || [ "${userinput}" == "${shortname}" ]; then - fn_install_file - else - echo -e "[ FAIL ] Unknown game server" - fi - else - fn_install_getopt - fi - -# LinuxGSM server mode. -else - core_modules.sh - if [ "${shortname}" != "core-dep" ]; then - # Load LinuxGSM configs. - # These are required to get all the default variables for the specific server. - # Load the default config. If missing download it. If changed reload it. - if [ ! -f "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" ]; then - mkdir -p "${configdirdefault}/config-lgsm/${gameservername}" - fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforcedl" "nohash" - fi - if [ ! -f "${configdirserver}/_default.cfg" ]; then - mkdir -p "${configdirserver}" - echo -en "copying _default.cfg...\c" - cp -R "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg" - exitcode=$? - if [ "${exitcode}" != 0 ]; then - echo -e "FAIL" - exit 1 - else - echo -e "OK" - fi - else - module_file_diff=$(diff -q "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg") - if [ "${module_file_diff}" != "" ]; then - fn_print_warn_nl "_default.cfg has been altered. reloading config." - echo -en "copying _default.cfg...\c" - cp -R "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg" - exitcode=$? - if [ "${exitcode}" != 0 ]; then - echo -e "FAIL" - exit 1 - else - echo -e "OK" - fi - fi - fi - # shellcheck source=/dev/null - source "${configdirserver}/_default.cfg" - # Load the common.cfg config. If missing download it. - if [ ! -f "${configdirserver}/common.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash" - # shellcheck source=/dev/null - source "${configdirserver}/common.cfg" - else - # shellcheck source=/dev/null - source "${configdirserver}/common.cfg" - fi - # Load the secrets-common.cfg config. If missing download it. - if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash" - # shellcheck source=/dev/null - source "${configdirserver}/secrets-common.cfg" - else - # shellcheck source=/dev/null - source "${configdirserver}/secrets-common.cfg" - fi - # Load the instance.cfg config. If missing download it. - if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash" - # shellcheck source=/dev/null - source "${configdirserver}/${selfname}.cfg" - else - # shellcheck source=/dev/null - source "${configdirserver}/${selfname}.cfg" - fi - # Load the secrets-instance.cfg config. If missing download it. - if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then - fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash" - # shellcheck source=/dev/null - source "${configdirserver}/secrets-${selfname}.cfg" - else - # shellcheck source=/dev/null - source "${configdirserver}/secrets-${selfname}.cfg" - fi - - # Load the linuxgsm.sh in to tmpdir. If missing download it. - if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then - fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nohash" - fi - fi - # Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off. - fn_ansi_loader - # Prevents running of core_exit.sh for Travis-CI. - if [ "${travistest}" != "1" ]; then - getopt=$1 - core_getopt.sh - fi -fi - -fn_currentstatus_tmux() { - check_status.sh - if [ "${status}" != "0" ]; then - currentstatus="STARTED" - else - currentstatus="STOPPED" - fi -} - -fn_setstatus() { - fn_currentstatus_tmux - echo"" - echo -e "Required status: ${requiredstatus}" - counter=0 - echo -e "Current status: ${currentstatus}" - while [ "${requiredstatus}" != "${currentstatus}" ]; do - counter=$((counter + 1)) - fn_currentstatus_tmux - echo -en "New status: ${currentstatus}\\r" - - if [ "${requiredstatus}" == "STARTED" ]; then - (command_start.sh > /dev/null 2>&1) - else - (command_stop.sh > /dev/null 2>&1) - fi - if [ "${counter}" -gt "5" ]; then - currentstatus="FAIL" - echo -e "Current status: ${currentstatus}" - echo -e "" - echo -e "Unable to start or stop server." - exit 1 - fi - done - echo -en "New status: ${currentstatus}\\r" - echo -e "\n" - echo -e "Test starting:" - echo -e "" -} - -# End of every test will expect the result to either pass or fail -# If the script does not do as intended the whole test will fail -# if expecting a pass -fn_test_result_pass() { - if [ $? != 0 ]; then - echo -e "=================================" - echo -e "Expected result: PASS" - echo -e "Actual result: FAIL" - fn_print_fail_nl "TEST FAILED" - exitcode=1 - core_exit.sh - else - echo -e "=================================" - echo -e "Expected result: PASS" - echo -e "Actual result: PASS" - fn_print_ok_nl "TEST PASSED" - echo -e "" - fi -} - -# if expecting a fail -fn_test_result_fail() { - if [ $? == 0 ]; then - echo -e "=================================" - echo -e "Expected result: FAIL" - echo -e "Actual result: PASS" - fn_print_fail_nl "TEST FAILED" - exitcode=1 - core_exit.sh - else - echo -e "=================================" - echo -e "Expected result: FAIL" - echo -e "Actual result: FAIL" - fn_print_ok_nl "TEST PASSED" - echo -e "" - fi -} - -# test result n/a -fn_test_result_na() { - echo -e "=================================" - echo -e "Expected result: N/A" - echo -e "Actual result: N/A" - fn_print_fail_nl "TEST N/A" -} - -sleeptime="0" - -echo -e "=================================" -echo -e "Travis CI Tests" -echo -e "Linux Game Server Manager" -echo -e "by Daniel Gibbs" -echo -e "Contributors: http://goo.gl/qLmitD" -echo -e "https://linuxgsm.com" -echo -e "=================================" -echo -e "" -echo -e "=================================" -echo -e "Server Tests" -echo -e "Using: ${gamename}" -echo -e "Testing Branch: ${TRAVIS_BRANCH}" -echo -e "=================================" - -echo -e "" -echo -e "Tests Summary" -echo -e "=================================" -echo -e "0.0 - Pre-test Tasks" -echo -e "0.1 - Create log dir's" -echo -e "0.2 - Enable dev-debug" -echo -e "" -echo -e "1.0 - Pre-install tests" -echo -e "1.1 - start - no files" -echo -e "1.2 - getopt" -echo -e "1.3 - getopt with incorrect args" -echo -e "" -echo -e "2.0 - Installation" -echo -e "2.1 - install" -echo -e "" -echo -e "3.0 - Start/Stop/Restart Tests" -echo -e "3.1 - start" -echo -e "3.2 - start - online" -echo -e "3.3 - start - updateonstart" -echo -e "3.4 - stop" -echo -e "3.5 - stop - offline" -echo -e "3.6 - restart" -echo -e "3.7 - restart - offline" -echo -e "" -echo -e "4.0 - Update Tests" -echo -e "4.1 - update" -echo -e "4.2 - update-lgsm" -echo -e "" -echo -e "5.0 - Monitor Tests" -echo -e "5.1 - monitor - online" -echo -e "5.2 - monitor - offline - with lockfile" -echo -e "5.3 - monitor - offline - no lockfile" -echo -e "5.4 - test-alert" -echo -e "" -echo -e "6.0 - Details Tests" -echo -e "6.1 - details" -echo -e "6.2 - postdetails" -echo -e "" -echo -e "7.0 - Backup Tests" -echo -e "7.1 - backup" -echo -e "" -echo -e "8.0 - Development Tools Tests" -echo -e "8.1 - dev - detect glibc" -echo -e "8.2 - dev - detect ldd" -echo -e "8.3 - dev - detect deps" -echo -e "8.4 - dev - query-raw" -echo -e "" -echo -e "9.0 - Sponsor" -echo -e "9.1 - sponsor" -echo -e "" -echo -e "0.0 - Pre-test Tasks" -echo -e "==================================================================" -echo -e "Description:" -echo -e "Create log dir's" -echo -e "" - -echo -e "" -echo -e "0.1 - Create log dir's" -echo -e "=================================" -echo -e "" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - install_logs.sh -) -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "0.2 - Enable dev-debug" -echo -e "=================================" -echo -e "Description:" -echo -e "Enable dev-debug" -echo -e "" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_debug.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "1.0 - Pre-install tests" -echo -e "==================================================================" -echo -e "" - -echo -e "1.1 - start - no files" -echo -e "=================================" -echo -e "Description:" -echo -e "test script reaction to missing server files." -echo -e "Command: ./${gameservername} start" -echo -e "" -# Allows for testing not on Travis CI -if [ -z "${TRAVIS}" ]; then - ( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_start.sh - ) - fn_test_result_fail -else - echo -e "Test bypassed" -fi - -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "1.2 - getopt" -echo -e "=================================" -echo -e "Description:" -echo -e "displaying options messages." -echo -e "Command: ./${gameservername}" -echo -e "" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - core_getopt.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "1.3 - getopt with incorrect args" -echo -e "=================================" -echo -e "Description:" -echo -e "displaying options messages." -echo -e "Command: ./${gameservername} abc123" -echo -e "" -getopt="abc123" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - core_getopt.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "2.0 - Installation" -echo -e "==================================================================" - -echo -e "" -echo -e "2.1 - install" -echo -e "=================================" -echo -e "Description:" -echo -e "install ${gamename} server." -echo -e "Command: ./${gameservername} auto-install" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - fn_autoinstall -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.0 - Start/Stop/Restart Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "3.1 - start" -echo -e "=================================" -echo -e "Description:" -echo -e "start ${gamename} server." -echo -e "Command: ./${gameservername} start" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_start.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.2 - start - online" -echo -e "=================================" -echo -e "Description:" -echo -e "start ${gamename} server while already running." -echo -e "Command: ./${gameservername} start" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_start.sh -) -fn_test_result_fail -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.3 - start - updateonstart" -echo -e "=================================" -echo -e "Description:" -echo -e "will update server on start." -echo -e "Command: ./${gameservername} start" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - updateonstart="on" - command_start.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.4 - stop" -echo -e "=================================" -echo -e "Description:" -echo -e "stop ${gamename} server." -echo -e "Command: ./${gameservername} stop" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_stop.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.5 - stop - offline" -echo -e "=================================" -echo -e "Description:" -echo -e "stop ${gamename} server while already stopped." -echo -e "Command: ./${gameservername} stop" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_stop.sh -) -fn_test_result_fail -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.6 - restart" -echo -e "=================================" -echo -e "Description:" -echo -e "restart ${gamename}." -echo -e "Command: ./${gameservername} restart" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_restart.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "3.7 - restart - offline" -echo -e "=================================" -echo -e "Description:" -echo -e "restart ${gamename} while already stopped." -echo -e "Command: ./${gameservername} restart" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_restart.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "4.0 - Update Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "4.1 - update" -echo -e "=================================" -echo -e "Description:" -echo -e "check for updates." -echo -e "Command: ./${gameservername} update" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_update.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "4.2 - update-lgsm" -echo -e "=================================" -echo -e "Description:" -echo -e "update LinuxGSM." -echo -e "" -echo -e "Command: ./jc2server update-lgam" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_update_linuxgsm.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "5.0 - Monitor Tests" -echo -e "==================================================================" -echo -e "" -info_game.sh -echo -e "Server IP - Port: ${ip}:${port}" -echo -e "Server IP - Query Port: ${ip}:${queryport}" - -echo -e "" -echo -e "5.1 - monitor - online" -echo -e "=================================" -echo -e "Description:" -echo -e "run monitor server while already running." -echo -e "Command: ./${gameservername} monitor" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_monitor.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "5.2 - monitor - offline - with lockfile" -echo -e "=================================" -echo -e "Description:" -echo -e "run monitor while server is offline with lockfile." -echo -e "Command: ./${gameservername} monitor" -requiredstatus="STOPPED" -fn_setstatus -fn_print_info_nl "creating lockfile." -date '+%s' > "${lockdir}/${selfname}.lock" -echo "${version}" >> "${lockdir}/${selfname}.lock" -echo "${port}" >> "${lockdir}/${selfname}.lock" -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_monitor.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "5.3 - monitor - offline - no lockfile" -echo -e "=================================" -echo -e "Description:" -echo -e "run monitor while server is offline with no lockfile." -echo -e "Command: ./${gameservername} monitor" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_monitor.sh -) -fn_test_result_fail -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "5.4 - test-alert" -echo -e "=================================" -echo -e "Description:" -echo -e "run monitor while server is offline with no lockfile." -echo -e "Command: ./${gameservername} test-alert" -requiredstatus="STOPPED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_test_alert.sh -) -fn_test_result_fail -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "6.0 - Details Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "6.1 - details" -echo -e "=================================" -echo -e "Description:" -echo -e "display details." -echo -e "Command: ./${gameservername} details" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_details.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "6.2 - postdetails" -echo -e "=================================" -echo -e "Description:" -echo -e "post details." -echo -e "Command: ./${gameservername} postdetails" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_postdetails.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "7.0 - Backup Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "7.1 - backup" -echo -e "=================================" -echo -e "Description:" -echo -e "run a backup." -echo -e "Command: ./${gameservername} backup" -requiredstatus="STARTED" -fn_setstatus -echo -e "test de-activated until issue #1839 fixed" -#(command_backup.sh) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "8.0 - Development Tools Tests" -echo -e "==================================================================" - -echo -e "" -echo -e "8.1 - dev - detect glibc" -echo -e "=================================" -echo -e "Description:" -echo -e "detect glibc." -echo -e "Command: ./${gameservername} detect-glibc" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_detect_glibc.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "8.2 - dev - detect ldd" -echo -e "=================================" -echo -e "Description:" -echo -e "detect ldd." -echo -e "Command: ./${gameservername} detect-ldd" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_detect_ldd.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "8.3 - dev - detect deps" -echo -e "=================================" -echo -e "Description:" -echo -e "detect dependencies." -echo -e "Command: ./${gameservername} detect-deps" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_detect_deps.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "8.4 - dev - query-raw" -echo -e "=================================" -echo -e "Description:" -echo -e "raw query output." -echo -e "Command: ./${gameservername} query-raw" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_dev_query_raw.sh -) -fn_test_result_na -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "9.0 - Sponsor" -echo -e "==================================================================" - -echo -e "" -echo -e "9.1 - sponsor" -echo -e "=================================" -echo -e "Description:" -echo -e "sponsor." -echo -e "Command: ./${gameservername} sponsor" -requiredstatus="STARTED" -fn_setstatus -( - exec 5> "${TRAVIS_BUILD_DIR}/dev-debug.log" - BASH_XTRACEFD="5" - set -x - command_sponsor.sh -) -fn_test_result_pass -echo -e "run order" -echo -e "=================" -grep modulefile= "${TRAVIS_BUILD_DIR}/dev-debug.log" | sed 's/modulefile=//g' - -echo -e "" -echo -e "=================================" -echo -e "Server Tests - Complete!" -echo -e "Using: ${gamename}" -echo -e "=================================" -requiredstatus="STOPPED" -fn_setstatus - -core_exit.sh From 9ff3409f4e0fb2f07dd5edca7440db344981591c Mon Sep 17 00:00:00 2001 From: CosminPerRam Date: Sat, 14 Oct 2023 19:32:33 +0300 Subject: [PATCH 3/4] docs: replace gamedig repository links to the actual repository (#4338) --- lgsm/functions/query_gamedig.sh | 2 +- lgsm/modules/query_gamedig.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/query_gamedig.sh b/lgsm/functions/query_gamedig.sh index 265607acd..344874011 100644 --- a/lgsm/functions/query_gamedig.sh +++ b/lgsm/functions/query_gamedig.sh @@ -4,7 +4,7 @@ # Contributors: http://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Querys a gameserver using node-gamedig. -# https://github.com/sonicsnes/node-gamedig +# https://github.com/gamedig/node-gamedig functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" querystatus="2" diff --git a/lgsm/modules/query_gamedig.sh b/lgsm/modules/query_gamedig.sh index 138e014a0..28f70a3b7 100644 --- a/lgsm/modules/query_gamedig.sh +++ b/lgsm/modules/query_gamedig.sh @@ -4,7 +4,7 @@ # Contributors: http://linuxgsm.com/contrib # Website: https://linuxgsm.com # Description: Querys a gameserver using node-gamedig. -# https://github.com/sonicsnes/node-gamedig +# https://github.com/gamedig/node-gamedig moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" # Default query status to failure. Will be changed to 0 if query is successful. From 68ae13c0695f1aaa5a1d6e8f711481e15e144542 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 15 Oct 2023 17:52:03 +0100 Subject: [PATCH 4/4] feat: change sleep timers (#4339) * refactor: simplify sleep time functions The `fn_sleep_time` function has been refactored to remove unnecessary conditions and set a default sleep time of 0.5 seconds. Additionally, four new functions (`fn_sleep_time_1`, `fn_sleep_time_5`, `fn_sleep_time_10`) have been added to provide different sleep times of 1, 5, and 10 seconds respectively. This improves code readability and allows for more flexibility in setting sleep times. * change sleep to fn_sleep_time * refactor: optimize sleep time functions - Refactored the code to optimize the sleep time functions. - Updated the `fn_sleep_time` function calls to `fn_sleep_time_1` in multiple files. - Removed unnecessary sleep time calls in some files. * refactor: simplify sleep time function call The code changes refactor the sleep time function call in the check_deps.sh file. Instead of calling fn_sleep_time_1, it now calls fn_sleep_time. This change simplifies the code and improves readability. * feat: add sleep time before checking session Add a sleep time of 1 second before checking the session in the command_monitor.sh file. This allows for better synchronization and improves the accuracy of the session check. * changes * refactor: optimize sleep time function The code changes refactor the sleep time function in multiple files to improve efficiency. The fn_sleep_time function is replaced with fn_sleep_time_1. This change reduces unnecessary delays during execution. * refactor: update sleep time function names The sleep time functions in the core_messages.sh file have been updated to use more descriptive names. The fn_sleep_time function has been renamed to fn_sleep_time_1 for clarity and consistency. This change improves code readability and maintainability. * refactor: optimize sleep time in core_messages.sh The commit optimizes the sleep time in the core_messages.sh file. The fn_sleep_time and fn_print_dots functions now use a shorter sleep time of 0.5 seconds instead of 1 second, resulting in faster execution. * refactor: improve readability and consistency in code - Refactored the log messages to use consistent capitalization and wording. - Updated log messages in check_glibc.sh, check_permissions.sh, command_backup.sh, command_update_linuxgsm.sh, command_wipe.sh, fix_samp.sh, install_config.sh, and set_dst_config_vars() functions. feat: add more descriptive log messages - Added more descriptive log messages to provide clearer information about the actions being performed. - Updated log messages in check_glibc.sh, check_permissions.sh, command_backup.sh, command_update_linuxgsm.sh, command_wipe.sh, fix_samp.sh, install_config.sh. fix: correct spelling errors in log messages - Corrected spelling errors in some of the log messages for better clarity. - Updated log messages in check_glibc.sh and fix_samp.sh. * refactor: remove unnecessary print statements This commit refactors the code by removing unnecessary print statements in multiple files. The removed print statements were used for displaying dots and warnings, but they are not needed anymore. This improves the readability and cleanliness of the code. * refactor: improve commit messages for code changes - Refactored check_glibc.sh to improve readability and clarity of error messages. - Refactored check_permissions.sh to provide more informative error messages when checking /sys permissions. - Refactored check_system_requirements.sh to provide clearer warning message when checking RAM requirements. - Refactored command_backup.sh to provide more descriptive messages when starting a backup. * remove legacy code * fix: remove \t * fix: run check_root check root was never running because of logic in linuxgsm.sh * fix: update warning message for missing sudo access The warning message for users without sudo access has been updated to provide clearer instructions. Instead of just suggesting manual installation, it now also suggests running the script as root using `./${selfname} install`. This change improves user experience and helps them resolve dependency installation issues more effectively. * tidy --- .github/workflows/serverlist-validate.sh | 2 +- lgsm/functions/check_status.sh | 2 +- lgsm/functions/command_stop.sh | 2 +- lgsm/modules/check_config.sh | 3 -- lgsm/modules/check_deps.sh | 20 ++++----- lgsm/modules/check_glibc.sh | 18 ++++---- lgsm/modules/check_permissions.sh | 13 +++--- lgsm/modules/check_root.sh | 2 +- lgsm/modules/check_system_requirements.sh | 6 +-- lgsm/modules/check_version.sh | 2 +- lgsm/modules/command_backup.sh | 50 ++++++----------------- lgsm/modules/command_dev_debug.sh | 4 ++ lgsm/modules/command_dev_details.sh | 2 +- lgsm/modules/command_fastdl.sh | 11 +++-- lgsm/modules/command_mods_remove.sh | 6 +-- lgsm/modules/command_mods_update.sh | 2 +- lgsm/modules/command_monitor.sh | 3 +- lgsm/modules/command_start.sh | 3 +- lgsm/modules/command_stop.sh | 15 +++---- lgsm/modules/command_update_linuxgsm.sh | 4 +- lgsm/modules/command_validate.sh | 8 ++-- lgsm/modules/command_wipe.sh | 14 +++---- lgsm/modules/core_messages.sh | 49 +++++++++++++--------- lgsm/modules/fix_kf.sh | 8 ++-- lgsm/modules/fix_kf2.sh | 2 +- lgsm/modules/fix_ro.sh | 10 ++--- lgsm/modules/fix_samp.sh | 4 +- lgsm/modules/fix_ut2k4.sh | 4 +- lgsm/modules/fix_ut3.sh | 2 +- lgsm/modules/info_messages.sh | 4 +- lgsm/modules/install_config.sh | 22 +++++----- lgsm/modules/install_eula.sh | 4 +- lgsm/modules/install_gslt.sh | 4 +- lgsm/modules/install_logs.sh | 2 - lgsm/modules/install_server_dir.sh | 1 - lgsm/modules/install_squad_license.sh | 2 +- lgsm/modules/install_stats.sh | 1 - lgsm/modules/install_ts3db.sh | 4 +- 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_ts3.sh | 2 +- lgsm/modules/update_ut99.sh | 2 +- lgsm/modules/update_vints.sh | 2 +- linuxgsm.sh | 19 +++++---- 48 files changed, 171 insertions(+), 181 deletions(-) diff --git a/.github/workflows/serverlist-validate.sh b/.github/workflows/serverlist-validate.sh index 50b2da712..bc192ec37 100755 --- a/.github/workflows/serverlist-validate.sh +++ b/.github/workflows/serverlist-validate.sh @@ -10,7 +10,7 @@ csvlist="$(ls -1 | grep -E '^(ubuntu|debian|centos|rhel|almalinux|rocky).*\.csv$ # loop though each csv file and make sure the number of lines is the same as the serverlistcount for csv in $csvlist; do csvcount="$(wc -l < "${csv}")" - csvcount=$((csvcount-2)) + csvcount=$((csvcount - 2)) if [ "$csvcount" -ne "$serverlistcount" ]; then echo "ERROR: $csv ($csvcount) does not match serverlist.csv ($serverlistcount)" exitcode=1 diff --git a/lgsm/functions/check_status.sh b/lgsm/functions/check_status.sh index a454b4eff..429f7c72d 100644 --- a/lgsm/functions/check_status.sh +++ b/lgsm/functions/check_status.sh @@ -7,4 +7,4 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" -status=$(tmux -L "${sessionname}" list-sessions -F "#{session_name}" 2>/dev/null | grep -Ecx "^${sessionname}") +status=$(tmux -L "${sessionname}" list-sessions -F "#{session_name}" 2> /dev/null | grep -Ecx "^${sessionname}") diff --git a/lgsm/functions/command_stop.sh b/lgsm/functions/command_stop.sh index d2e88fcea..92785af98 100644 --- a/lgsm/functions/command_stop.sh +++ b/lgsm/functions/command_stop.sh @@ -15,7 +15,7 @@ fn_stop_graceful_ctrlc() { fn_print_dots "Graceful: CTRL+c" fn_script_log_info "Graceful: CTRL+c" # Sends quit. - tmux -L "${sessionname}" send-keys -t "${sessionname}" C-c > /dev/null 2>&1 + tmux -L "${sessionname}" send-keys -t "${sessionname}" C-c > /dev/null 2>&1 # Waits up to 30 seconds giving the server time to shutdown gracefuly. for seconds in {1..30}; do check_status.sh diff --git a/lgsm/modules/check_config.sh b/lgsm/modules/check_config.sh index 436740afa..42892a191 100644 --- a/lgsm/modules/check_config.sh +++ b/lgsm/modules/check_config.sh @@ -8,7 +8,6 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" if [ -n "${servercfgfullpath}" ] && [ ! -f "${servercfgfullpath}" ]; then - fn_print_dots "" fn_print_warn_nl "Configuration file missing!" echo -e "${servercfgfullpath}" fn_script_log_warn "Configuration file missing!" @@ -17,11 +16,9 @@ if [ -n "${servercfgfullpath}" ] && [ ! -f "${servercfgfullpath}" ]; then fi if [ "${shortname}" == "rust" ] && [ -v rconpassword ] && [ -z "${rconpassword}" ]; then - fn_print_dots "" fn_print_fail_nl "RCON password is not set" fn_script_log_warn "RCON password is not set" elif [ -v rconpassword ] && [ "${rconpassword}" == "CHANGE_ME" ]; then - fn_print_dots "" fn_print_warn_nl "Default RCON Password detected" fn_script_log_warn "Default RCON Password detected" fi diff --git a/lgsm/modules/check_deps.sh b/lgsm/modules/check_deps.sh index d10948ca5..0f8304a18 100644 --- a/lgsm/modules/check_deps.sh +++ b/lgsm/modules/check_deps.sh @@ -25,11 +25,11 @@ fn_install_mono_repo() { fn_print_information_nl "Automatically adding Mono repository." fn_script_log_info "Automatically adding Mono repository." echo -en ".\r" - sleep 1 + fn_sleep_time_1 echo -en "..\r" - sleep 1 + fn_sleep_time_1 echo -en "...\r" - sleep 1 + fn_sleep_time_1 echo -en " \r" if [ "${distroid}" == "ubuntu" ]; then if [ "${distroversion}" == "22.04" ]; then @@ -160,8 +160,8 @@ fn_install_missing_deps() { fn_print_information_nl "$(whoami) has sudo access." fn_script_log_info "$(whoami) has sudo access." else - fn_print_warning_nl "$(whoami) does not have sudo access. Manually install dependencies." - fn_script_log_warn "$(whoami) does not have sudo access. Manually install dependencies." + fn_print_warning_nl "$(whoami) does not have sudo access. Manually install dependencies or run ./${selfname} install as root." + fn_script_log_warn "$(whoami) does not have sudo access. Manually install dependencies or run ./${selfname} install as root." fi fi @@ -177,11 +177,11 @@ fn_install_missing_deps() { fn_print_information_nl "Automatically installing missing dependencies." fn_script_log_info "Automatically installing missing dependencies." echo -en ".\r" - sleep 1 + fn_sleep_time_1 echo -en "..\r" - sleep 1 + fn_sleep_time_1 echo -en "...\r" - sleep 1 + fn_sleep_time_1 echo -en " \r" if [ "$(command -v apt 2> /dev/null)" ]; then cmd="echo steamcmd steam/question select \"I AGREE\" | sudo debconf-set-selections; echo steamcmd steam/license note '' | sudo debconf-set-selections; ${i386installcommand}sudo apt-get update; sudo apt-get -y install ${array_deps_missing[*]}" @@ -306,14 +306,14 @@ fn_deps_detector() { missingdep=0 if [ "${commandname}" == "INSTALL" ]; then echo -e "${green}${deptocheck}${default}" - sleep 0.1 + fn_sleep_time fi elif [ "${depstatus}" != "0" ]; then # If dependency is not found. missingdep=1 if [ "${commandname}" == "INSTALL" ]; then echo -e "${red}${deptocheck}${default}" - sleep 0.1 + fn_sleep_time fi # If SteamCMD requirements are not met install will fail. if [ -n "${appid}" ]; then diff --git a/lgsm/modules/check_glibc.sh b/lgsm/modules/check_glibc.sh index 25357a461..9da491bce 100644 --- a/lgsm/modules/check_glibc.sh +++ b/lgsm/modules/check_glibc.sh @@ -13,17 +13,19 @@ if [ "${glibc}" == "null" ]; then # Glibc is not required. : elif [ -z "${glibc}" ]; then - fn_print_dots "glibc" - fn_print_error_nl "glibc requirement unknown" - fn_script_log_error "glibc requirement unknown" + fn_print_dots "Checking glibc" + fn_print_error_nl "Checking glibc: requirement unknown" + fn_script_log_error "Checking glibc: requirement unknown" + fn_sleep_time_5 elif [ "$(printf '%s\n'${glibc}'\n' "${glibcversion}" | sort -V | head -n 1)" != "${glibc}" ]; then - fn_print_dots "glibc" - fn_print_error_nl "glibc requirements not met" - fn_script_log_error "glibc requirements not met" + fn_print_dots "Checking glibc" + fn_print_error_nl "Checking glibc: requirements not met" + fn_script_log_error "Checking glibc: requirements not met" echo -en "\n" echo -e " * glibc required: ${glibc}" echo -e " * glibc installed: ${red}${glibcversion}${default}" echo -en "\n" - fn_print_information_nl "distro upgrade is required" - fn_script_log_info "distro upgrade is required" + fn_print_information_nl "Distro upgrade is required" + fn_script_log_info "Distro upgrade is required" + fn_sleep_time_5 fi diff --git a/lgsm/modules/check_permissions.sh b/lgsm/modules/check_permissions.sh index a6a37ce5c..572b403cc 100644 --- a/lgsm/modules/check_permissions.sh +++ b/lgsm/modules/check_permissions.sh @@ -171,7 +171,7 @@ fn_sys_perm_fix_manually_msg() { fn_script_log_info "To fix this issue, run the following command as root:" echo -e " chmod a+rx /sys /sys/class /sys/class/net" fn_script_log "chmod a+rx /sys /sys/class /sys/class/net" - fn_sleep_time + fn_sleep_time_5 if [ "${monitorflag}" == 1 ]; then alert="permissions" alert.sh @@ -182,8 +182,8 @@ fn_sys_perm_fix_manually_msg() { # Attempt to fix /sys related permission errors if sudo is available, exits otherwise. fn_sys_perm_errors_fix() { if sudo -n true > /dev/null 2>&1; then - fn_print_dots "Automatically fixing /sys permissions" - fn_script_log_info "Automatically fixing /sys permissions." + fn_print_dots "Fixing /sys permissions" + fn_script_log_info "Fixing /sys permissions." if [ "${sysdirpermerror}" == "1" ]; then sudo chmod a+rx "/sys" fi @@ -202,7 +202,7 @@ fn_sys_perm_errors_fix() { # Show the user how to fix. fn_sys_perm_fix_manually_msg else - fn_print_ok_nl "Automatically fixing /sys permissions" + fn_print_ok_nl "Fixing /sys permissions" fn_script_log_pass "Permissions in /sys fixed" fi else @@ -216,8 +216,9 @@ fn_sys_perm_error_process() { fn_sys_perm_errors_detect # If any error was found. if [ "${sysdirpermerror}" == "1" ] || [ "${classdirpermerror}" == "1" ] || [ "${netdirpermerror}" == "1" ]; then - fn_print_error_nl "Permission error(s) found in /sys" - fn_script_log_error "Permission error(s) found in /sys" + fn_print_dots "Checking /sys permissions" + fn_print_error_nl "Checking /sys permissions" + fn_script_log_error "Checking /sys permissions" # Run the fix fn_sys_perm_errors_fix fi diff --git a/lgsm/modules/check_root.sh b/lgsm/modules/check_root.sh index 81115394a..8fe20764c 100644 --- a/lgsm/modules/check_root.sh +++ b/lgsm/modules/check_root.sh @@ -9,7 +9,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" if [ "$(whoami)" == "root" ]; then if [ "${commandname}" != "INSTALL" ]; then - fn_print_fail_nl "Do NOT run this script as root!" + fn_print_fail_nl "Do NOT run as root!" if [ -d "${lgsmlogdir}" ]; then fn_script_log_fail "${selfname} attempted to run as root." else diff --git a/lgsm/modules/check_system_requirements.sh b/lgsm/modules/check_system_requirements.sh index 88fb9d15a..6932de4dc 100644 --- a/lgsm/modules/check_system_requirements.sh +++ b/lgsm/modules/check_system_requirements.sh @@ -46,10 +46,10 @@ fi # If the game or engine has a minimum RAM Requirement, compare it to system's available RAM. if [ "${ramrequirementmb}" ]; then if [ "${physmemtotalmb}" -lt "${ramrequirementmb}" ]; then - fn_print_dots "Check RAM" + fn_print_dots "Checking RAM" # Warn the user. - fn_print_warn_nl "Check RAM: ${ramrequirementgb}G required, ${physmemtotal} available" + fn_print_warn_nl "Checking RAM: ${ramrequirementgb}G required, ${physmemtotal} available" echo "* ${gamename} server may fail to run or experience poor performance." - fn_sleep_time + fn_sleep_time_5 fi fi diff --git a/lgsm/modules/check_version.sh b/lgsm/modules/check_version.sh index 3ca015843..5369fd832 100644 --- a/lgsm/modules/check_version.sh +++ b/lgsm/modules/check_version.sh @@ -16,8 +16,8 @@ if [ -n "${modulesversion}" ] && [ -n "${version}" ] && [ "${version}" != "${mod echo -e "* ${selfname}: ${version}" echo -e "* modules: ${modulesversion}" echo -e "" - fn_sleep_time fn_script_log_error "LinuxGSM Version mismatch: ${selfname}: ${version}: modules: ${modulesversion}" + fn_sleep_time_1 command_update_linuxgsm.sh fn_firstcommand_reset fi diff --git a/lgsm/modules/command_backup.sh b/lgsm/modules/command_backup.sh index 16223c914..fac5dc38b 100644 --- a/lgsm/modules/command_backup.sh +++ b/lgsm/modules/command_backup.sh @@ -10,8 +10,6 @@ commandaction="Backing up" moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_firstcommand_set -check.sh - # Trap to remove lockfile on quit. fn_backup_trap() { echo -e "" @@ -56,12 +54,14 @@ fn_backup_init() { backupname="${selfname}-$(date '+%Y-%m-%d-%H%M%S')" info_distro.sh - fn_print_dots "Backup starting" - fn_script_log_info "Backup starting" - fn_print_ok_nl "Backup starting" + fn_print_dots "Starting backup" + fn_script_log_info "Starting backup" if [ ! -d "${backupdir}" ] || [ "${backupcount}" == "0" ]; then - fn_print_info_nl "There are no previous backups" + fn_print_info_nl "Starting backup: No previous backups found" + fn_script_log_info "No previous backups found" else + fn_print_info_nl "Starting backup: Previous backups found" + fn_script_log_info "Previous backups found" if [ "${lastbackupdaysago}" == "0" ]; then daysago="less than 1 day ago" elif [ "${lastbackupdaysago}" == "1" ]; then @@ -101,32 +101,6 @@ fn_backup_dir() { fi } -# Migrate Backups from old dir before refactor -fn_backup_migrate_olddir() { - # Check if old backup dir is there before the refactor and move the backups - if [ -d "${rootdir}/backups" ]; then - if [ "${rootdir}/backups" != "${backupdir}" ]; then - fn_print_dots "Backup directory is being migrated" - fn_script_log_info "Backup directory is being migrated" - fn_script_log_info "${rootdir}/backups > ${backupdir}" - mv "${rootdir}/backups/"* "${backupdir}" 2> /dev/null - exitcode=$? - if [ "${exitcode}" == 0 ]; then - rmdir "${rootdir}/backups" 2> /dev/null - exitcode=$? - fi - if [ "${exitcode}" != 0 ]; then - fn_print_error_nl "Backup directory is being migrated" - fn_script_log_error "Backup directory is being migrated" - else - - fn_print_ok_nl "Backup directory is being migrated" - fn_script_log_pass "Backup directory is being migrated" - fi - fi - fi -} - fn_backup_create_lockfile() { # Create lockfile. date '+%s' > "${lockdir:?}/backup.lock" @@ -142,7 +116,7 @@ fn_backup_compression() { fn_print_info "A total of ${rootdirduexbackup} will be compressed." fn_script_log_info "A total of ${rootdirduexbackup} will be compressed: ${backupdir}/${backupname}.tar.gz" fn_print_dots "Backup (${rootdirduexbackup}) ${backupname}.tar.gz, in progress..." - fn_script_log_info "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 is a valid path. @@ -187,7 +161,7 @@ fn_backup_prune() { # Display how many backups will be cleared. echo -e "* Pruning: ${backupquotadiff} backup(s) has exceeded the ${maxbackups} backups limit" fn_script_log_info "Pruning: ${backupquotadiff} backup(s) has exceeded the ${maxbackups} backups limit" - fn_sleep_time + fn_sleep_time_1 fn_print_dots "Pruning: Clearing ${backupquotadiff} backup(s)" fn_script_log_info "Pruning: Clearing ${backupquotadiff} backup(s)" # Clear backups over quota. @@ -199,7 +173,7 @@ fn_backup_prune() { # Display how many backups will be cleared. echo -e "* Pruning: ${backupsoudatedcount} backup(s) are older than ${maxbackupdays} days." fn_script_log_info "Pruning: ${backupsoudatedcount} backup(s) older than ${maxbackupdays} days." - fn_sleep_time + fn_sleep_time_1 fn_print_dots "Pruning: Clearing ${backupquotadiff} backup(s)." fn_script_log_info "Pruning: Clearing ${backupquotadiff} backup(s)" # Clear backups over quota @@ -264,12 +238,14 @@ fn_backup_start_server() { fi } -# Run functions. +fn_print_dots "" +check.sh +core_logs.sh + fn_backup_check_lockfile fn_backup_init fn_backup_stop_server fn_backup_dir -fn_backup_migrate_olddir fn_backup_create_lockfile fn_backup_compression fn_backup_prune diff --git a/lgsm/modules/command_dev_debug.sh b/lgsm/modules/command_dev_debug.sh index 081bda611..eb0356985 100644 --- a/lgsm/modules/command_dev_debug.sh +++ b/lgsm/modules/command_dev_debug.sh @@ -10,6 +10,10 @@ commandaction="Developer debug" moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_firstcommand_reset +fn_print_dots "" +check.sh +core_logs.sh + if [ -f "${rootdir}/.dev-debug" ]; then rm -f "${rootdir:?}/.dev-debug" fn_print_ok_nl "Disabled dev-debug" diff --git a/lgsm/modules/command_dev_details.sh b/lgsm/modules/command_dev_details.sh index 2659465d3..93dae77bc 100644 --- a/lgsm/modules/command_dev_details.sh +++ b/lgsm/modules/command_dev_details.sh @@ -19,8 +19,8 @@ carriagereturn=$(file -b "${servercfgfullpath}" | grep -q CRLF && echo "${red}CR echo -e "" echo -e "${bold}${lightgreen}Server Details${default}" fn_messages_separator -echo -e "" +echo -e "" echo -e "Game: ${gamename}" echo -e "Config type: ${configtype}" echo -e "Config file: ${servercfgfullpath}" diff --git a/lgsm/modules/command_fastdl.sh b/lgsm/modules/command_fastdl.sh index acc3a1ba4..c1c667797 100644 --- a/lgsm/modules/command_fastdl.sh +++ b/lgsm/modules/command_fastdl.sh @@ -10,8 +10,6 @@ commandaction="Fastdl" moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_firstcommand_set -check.sh - # Directories. if [ -z "${webdir}" ]; then webdir="${rootdir}/public_html" @@ -209,7 +207,7 @@ fn_fastdl_preview() { fi if [ -f "${tmpdir}/fastdl_files_to_compress.txt" ]; then echo -e "calculating total file size..." - fn_sleep_time + fn_sleep_time_1 totalfiles=$(wc -l < "${tmpdir}/fastdl_files_to_compress.txt") # Calculates total file size. while read -r dufile; do @@ -276,7 +274,7 @@ fn_fastdl_gmod() { fi # Clear addons directory in fastdl. echo -en "clearing addons dir from fastdl dir..." - fn_sleep_time + fn_sleep_time_1 rm -rf "${fastdldir:?}/addons" exitcode=$? if [ "${exitcode}" != 0 ]; then @@ -291,7 +289,7 @@ fn_fastdl_gmod() { # Correct content that may be into a lua directory by mistake like some darkrpmodification addons. if [ -d "${fastdldir}/lua" ]; then echo -en "correcting DarkRP files..." - fn_sleep_time + fn_sleep_time_1 cp -Rf "${fastdldir}/lua/"* "${fastdldir}" exitcode=$? if [ "${exitcode}" != 0 ]; then @@ -335,7 +333,7 @@ fn_fastdl_source() { tput rc tput el echo -e "copying ${directory} ${allowed_extention} : ${fileswc}..." - fn_sleep_time + fn_sleep_time_1 # get relative path of file in the dir tmprelfilepath="${fastdlfile#"${systemdir}/"}" copytodir="${tmprelfilepath%/*}" @@ -427,6 +425,7 @@ fn_fastdl_bzip2() { fn_print_ok_eol_nl } +check.sh # Run functions. fn_fastdl_preview fn_clear_old_fastdl diff --git a/lgsm/modules/command_mods_remove.sh b/lgsm/modules/command_mods_remove.sh index db7763cd8..5f70ac389 100644 --- a/lgsm/modules/command_mods_remove.sh +++ b/lgsm/modules/command_mods_remove.sh @@ -59,7 +59,7 @@ fn_script_log_info "Removing ${modsfilelistsize} files from ${modprettyname}" echo -e "removing ${modprettyname}" echo -e "* ${modsfilelistsize} files to be removed" echo -e "* location: ${modinstalldir}" -fn_sleep_time +fn_sleep_time_1 # Go through every file and remove it. modfileline="1" tput sc @@ -99,7 +99,7 @@ fi # Remove file list. echo -en "removing ${modcommand}-files.txt..." -fn_sleep_time +fn_sleep_time_1 rm -rf "${modsdir:?}/${modcommand}-files.txt" exitcode=$? if [ "${exitcode}" != 0 ]; then @@ -113,7 +113,7 @@ fi # Remove mods from installed mods list. echo -en "removing ${modcommand} from ${modsinstalledlist}..." -fn_sleep_time +fn_sleep_time_1 sed -i "/^${modcommand}$/d" "${modsinstalledlistfullpath}" exitcode=$? diff --git a/lgsm/modules/command_mods_update.sh b/lgsm/modules/command_mods_update.sh index cfbafc80c..cd5c3b03f 100644 --- a/lgsm/modules/command_mods_update.sh +++ b/lgsm/modules/command_mods_update.sh @@ -18,7 +18,7 @@ mods_core.sh fn_remove_cfg_files() { if [ "${modkeepfiles}" != "OVERWRITE" ] && [ "${modkeepfiles}" != "NOUPDATE" ]; then echo -e "the following files/directories will be preserved:" - fn_sleep_time + fn_sleep_time_1 # Count how many files there are to remove. filestopreserve=$(echo -e "${modkeepfiles}" | awk -F ';' '{ print NF }') # Test all subvalues of "modkeepfiles" using the ";" separator. diff --git a/lgsm/modules/command_monitor.sh b/lgsm/modules/command_monitor.sh index 079ad334d..d4d88bd56 100644 --- a/lgsm/modules/command_monitor.sh +++ b/lgsm/modules/command_monitor.sh @@ -330,7 +330,7 @@ fn_monitor_query() { # Second counter will wait for 15s before breaking loop. for seconds in {1..15}; do fn_print_fail "Querying port: ${querymethod}: ${ip}:${queryport} : ${totalseconds}/${queryattempt} : ${cyan}WAIT${default}" - sleep 0.5 + fn_sleep_time_1 totalseconds=$((totalseconds + 1)) if [ "${seconds}" == "15" ]; then break @@ -371,6 +371,7 @@ fn_monitor_loop() { done } +fn_print_dots "" monitorflag=1 # Dont do any monitoring or checks if installer is running. fn_monitor_check_install diff --git a/lgsm/modules/command_start.sh b/lgsm/modules/command_start.sh index 4b45f0bc3..364733ea2 100644 --- a/lgsm/modules/command_start.sh +++ b/lgsm/modules/command_start.sh @@ -114,7 +114,7 @@ fn_start_tmux() { echo -e "Console logging disabled in settings" >> "${consolelog}" fn_script_log_info "Console logging disabled by user" fi - fn_sleep_time + fn_sleep_time_1 # If the server fails to start. check_status.sh @@ -186,6 +186,7 @@ if [ "${firstcommandname}" == "START" ] || [ "${firstcommandname}" == "RESTART" date '+%s' > "${lockdir:?}/${selfname}-monitoring.lock" fi +fn_print_dots "" check.sh # If the server already started dont start again. diff --git a/lgsm/modules/command_stop.sh b/lgsm/modules/command_stop.sh index ee9152862..1567252f9 100644 --- a/lgsm/modules/command_stop.sh +++ b/lgsm/modules/command_stop.sh @@ -25,7 +25,7 @@ fn_stop_graceful_ctrlc() { fn_script_log_pass "Graceful: CTRL+c: OK: ${seconds} seconds" break fi - sleep 1 + fn_sleep_time_1 fn_print_dots "Graceful: CTRL+c: ${seconds}" done check_status.sh @@ -53,7 +53,7 @@ fn_stop_graceful_cmd() { fn_script_log_pass "Graceful: sending \"${1}\": OK: ${seconds} seconds" break fi - sleep 1 + fn_sleep_time_1 fn_print_dots "Graceful: sending \"${1}\": ${seconds}" done check_status.sh @@ -74,7 +74,7 @@ fn_stop_graceful_goldsrc() { tmux -L "${socketname}" send -t "${sessionname}" quit ENTER > /dev/null 2>&1 # Waits 3 seconds as goldsrc servers restart with the quit command. for seconds in {1..3}; do - sleep 1 + fn_sleep_time_1 fn_print_dots "Graceful: sending \"quit\": ${seconds}" done fn_print_ok "Graceful: sending \"quit\": ${seconds}: " @@ -154,7 +154,7 @@ fn_stop_graceful_sdtd() { fn_script_log_pass "Graceful: telnet: ${telnetip}:${telnetport} : ${seconds} seconds" break fi - sleep 1 + fn_sleep_time_1 fn_print_dots "Graceful: telnet: ${seconds}" done # If telnet shutdown fails tmux shutdown will be used, this risks loss of world save. @@ -185,7 +185,7 @@ fn_stop_graceful_avorion() { fn_script_log_info "Graceful: /save /stop" # Sends /save. tmux -L "${socketname}" send-keys -t "${sessionname}" /save ENTER > /dev/null 2>&1 - sleep 5 + fn_sleep_time_5 # Sends /quit. tmux -L "${socketname}" send-keys -t "${sessionname}" /stop ENTER > /dev/null 2>&1 # Waits up to 30 seconds giving the server time to shutdown gracefuly. @@ -197,7 +197,7 @@ fn_stop_graceful_avorion() { fn_script_log_pass "Graceful: /save /stop: OK: ${seconds} seconds" break fi - sleep 1 + fn_sleep_time_1 fn_print_dots "Graceful: /save /stop: ${seconds}" done check_status.sh @@ -241,7 +241,7 @@ fn_stop_tmux() { fn_script_log_info "tmux kill-session: ${sessionname}: ${servername}" # Kill tmux session. tmux -L "${socketname}" kill-session -t "${sessionname}" > /dev/null 2>&1 - sleep 0.5 + fn_sleep_time_1 check_status.sh if [ "${status}" == "0" ]; then fn_print_ok_nl "${servername}" @@ -268,6 +268,7 @@ fn_stop_pre_check() { fi } +fn_print_dots "" check.sh # Create a stopping lockfile that only exists while the stop command is running. diff --git a/lgsm/modules/command_update_linuxgsm.sh b/lgsm/modules/command_update_linuxgsm.sh index 65b72bcbb..9cd66430c 100644 --- a/lgsm/modules/command_update_linuxgsm.sh +++ b/lgsm/modules/command_update_linuxgsm.sh @@ -10,10 +10,10 @@ commandaction="Updating LinuxGSM" moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_firstcommand_set +fn_print_dots "" check.sh info_distro.sh -fn_print_dots "" fn_script_log_info "Updating LinuxGSM" fn_print_dots "Selecting repo" @@ -92,7 +92,7 @@ if [ "${script_diff}" != "" ]; then fi echo -en "copying ${selfname}...\c" - fn_script_log_info "copying ${selfname}" + fn_script_log_info "Copying ${selfname}" cp "${tmpdir}/linuxgsm.sh" "${rootdir}/${selfname}" sed -i "s+shortname=\"core\"+shortname=\"${shortname}\"+g" "${rootdir}/${selfname}" sed -i "s+gameservername=\"core\"+gameservername=\"${gameservername}\"+g" "${rootdir}/${selfname}" diff --git a/lgsm/modules/command_validate.sh b/lgsm/modules/command_validate.sh index f4a6250f3..d3511d7bb 100644 --- a/lgsm/modules/command_validate.sh +++ b/lgsm/modules/command_validate.sh @@ -17,7 +17,7 @@ fn_validate() { for seconds in {3..1}; do fn_print_warn "Validate might overwrite some customised files: ${totalseconds}" totalseconds=$((totalseconds - 1)) - sleep 1 + fn_sleep_time_1 if [ "${seconds}" == "0" ]; then break fi @@ -27,11 +27,11 @@ fn_validate() { fn_dl_steamcmd } -# The location where the builds are checked and downloaded. -remotelocation="SteamCMD" +fn_print_dots "" check.sh +core_logs.sh -fn_print_dots "${remotelocation}" +fn_print_dots "SteamCMD" if [ "${status}" != "0" ]; then fn_print_restart_warning diff --git a/lgsm/modules/command_wipe.sh b/lgsm/modules/command_wipe.sh index 193d2cd2d..d20bd0d3e 100644 --- a/lgsm/modules/command_wipe.sh +++ b/lgsm/modules/command_wipe.sh @@ -30,7 +30,7 @@ fn_wipe_files() { if [ -n "${serverwipe}" ] || [ -n "${mapwipe}" ]; then if [ -n "$(find "${serveridentitydir}" -type f -name "*.map")" ]; then echo -en "removing .map file(s)..." - fn_script_log_info "removing *.map file(s)" + fn_script_log_info "Removing *.map file(s)" fn_sleep_time find "${serveridentitydir:?}" -type f -name "*.map" -printf "%f\n" >> "${lgsmlog}" find "${serveridentitydir:?}" -type f -name "*.map" -delete | tee -a "${lgsmlog}" @@ -45,7 +45,7 @@ fn_wipe_files() { if [ -n "${serverwipe}" ] || [ -n "${mapwipe}" ]; then if [ -n "$(find "${serveridentitydir}" -type f -name "*.sav*")" ]; then echo -en "removing .sav file(s)..." - fn_script_log_info "removing .sav file(s)" + fn_script_log_info "Removing .sav file(s)" fn_sleep_time find "${serveridentitydir:?}" -type f -name "*.sav*" -printf "%f\n" >> "${lgsmlog}" find "${serveridentitydir:?}" -type f -name "*.sav*" -delete @@ -61,7 +61,7 @@ fn_wipe_files() { if [ -n "${serverwipe}" ]; then if [ -n "$(find "${serveridentitydir}" -type f ! -name 'player.tokens.db' -name "*.db")" ]; then echo -en "removing .db file(s)..." - fn_script_log_info "removing .db file(s)" + fn_script_log_info "Removing .db file(s)" fn_sleep_time find "${serveridentitydir:?}" -type f ! -name 'player.tokens.db' -name "*.db" -printf "%f\n" >> "${lgsmlog}" find "${serveridentitydir:?}" -type f ! -name 'player.tokens.db' -name "*.db" -delete @@ -79,9 +79,9 @@ fn_map_wipe_warning() { fn_script_log_warn "Map wipe will reset the map data and keep blueprint data" totalseconds=3 for seconds in {3..1}; do - fn_print_warn "Map wipe will reset the map data and keep blueprint data: ${totalseconds}" + fn_print_warn "map wipe will reset the map data and keep blueprint data: ${totalseconds}" totalseconds=$((totalseconds - 1)) - sleep 1 + fn_sleep_time_1 if [ "${seconds}" == "0" ]; then break fi @@ -94,9 +94,9 @@ fn_full_wipe_warning() { fn_script_log_warn "Server wipe will reset the map data and remove blueprint data" totalseconds=3 for seconds in {3..1}; do - fn_print_warn "Server wipe will reset the map data and remove blueprint data: ${totalseconds}" + fn_print_warn "server wipe will reset the map data and remove blueprint data: ${totalseconds}" totalseconds=$((totalseconds - 1)) - sleep 1 + fn_sleep_time_1 if [ "${seconds}" == "0" ]; then break fi diff --git a/lgsm/modules/core_messages.sh b/lgsm/modules/core_messages.sh index 5af4c5639..929e942be 100644 --- a/lgsm/modules/core_messages.sh +++ b/lgsm/modules/core_messages.sh @@ -35,12 +35,23 @@ fn_ansi_loader() { } fn_sleep_time() { - if [ "${sleeptime}" != "0" ] || [ "${travistest}" != "1" ]; then - if [ -z "${sleeptime}" ]; then - sleeptime=0.5 - fi - sleep "${sleeptime}" - fi + sleep "0.1" +} + +fn_sleep_time_05() { + sleep "0.5" +} + +fn_sleep_time_1() { + sleep "1" +} + +fn_sleep_time_5() { + sleep "5" +} + +fn_sleep_time_10() { + sleep "10" } # Log display @@ -137,7 +148,7 @@ fn_print_dots() { else echo -en "${creeol}[ .... ] $*" fi - fn_sleep_time + fn_sleep_time_05 } fn_print_dots_nl() { @@ -146,7 +157,7 @@ fn_print_dots_nl() { else echo -e "${creeol}[ .... ] $*" fi - fn_sleep_time + fn_sleep_time_05 echo -en "\n" } @@ -476,56 +487,56 @@ fn_print_info_eol_nl() { # QUERYING fn_print_querying_eol() { echo -en "${cyan}QUERYING${default}" - fn_sleep_time + fn_sleep_time_1 } fn_print_querying_eol_nl() { echo -e "${cyan}QUERYING${default}" - fn_sleep_time + fn_sleep_time_1 } # CHECKING fn_print_checking_eol() { echo -en "${cyan}CHECKING${default}" - fn_sleep_time + fn_sleep_time_1 } fn_print_checking_eol_nl() { echo -e "${cyan}CHECKING${default}" - fn_sleep_time + fn_sleep_time_1 } # DELAY fn_print_delay_eol() { echo -en "${green}DELAY${default}" - fn_sleep_time + fn_sleep_time_1 } fn_print_delay_eol_nl() { echo -e "${green}DELAY${default}" - fn_sleep_time + fn_sleep_time_1 } # CANCELED fn_print_canceled_eol() { echo -en "${lightyellow}CANCELED${default}" - fn_sleep_time + fn_sleep_time_1 } fn_print_canceled_eol_nl() { echo -e "${lightyellow}CANCELED${default}" - fn_sleep_time + fn_sleep_time_1 } # REMOVED fn_print_removed_eol() { echo -en "${red}REMOVED${default}" - fn_sleep_time + fn_sleep_time_1 } fn_print_removed_eol_nl() { echo -e "${red}REMOVED${default}" - fn_sleep_time + fn_sleep_time_1 } # UPDATE @@ -582,7 +593,7 @@ fn_print_restart_warning() { for seconds in {3..1}; do fn_print_warn "${selfname} will be restarted: ${totalseconds}" totalseconds=$((totalseconds - 1)) - sleep 1 + fn_sleep_time_1 if [ "${seconds}" == "0" ]; then break fi diff --git a/lgsm/modules/fix_kf.sh b/lgsm/modules/fix_kf.sh index fe8b574aa..1bec47a4b 100644 --- a/lgsm/modules/fix_kf.sh +++ b/lgsm/modules/fix_kf.sh @@ -7,12 +7,12 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" -echo -e "Applying WebAdmin ROOst.css fix." +echo -e "applying WebAdmin ROOst.css fix." echo -e "http://forums.tripwireinteractive.com/showpost.php?p=585435&postcount=13" sed -i 's/none}/none;/g' "${serverfiles}/Web/ServerAdmin/ROOst.css" sed -i 's/underline}/underline;/g' "${serverfiles}/Web/ServerAdmin/ROOst.css" fn_sleep_time -echo -e "Applying WebAdmin CharSet fix." +echo -e "applying WebAdmin CharSet fix." echo -e "http://forums.tripwireinteractive.com/showpost.php?p=442340&postcount=1" sed -i 's/CharSet="iso-8859-1"/CharSet="utf-8"/g' "${systemdir}/UWeb.int" fn_sleep_time @@ -23,14 +23,14 @@ fn_sleep_time exitbypass=1 command_start.sh fn_firstcommand_reset -sleep 5 +fn_sleep_time_5 exitbypass=1 command_stop.sh fn_firstcommand_reset exitbypass=1 command_start.sh fn_firstcommand_reset -sleep 5 +fn_sleep_time_5 exitbypass=1 command_stop.sh fn_firstcommand_reset diff --git a/lgsm/modules/fix_kf2.sh b/lgsm/modules/fix_kf2.sh index 13176d448..cb4707414 100644 --- a/lgsm/modules/fix_kf2.sh +++ b/lgsm/modules/fix_kf2.sh @@ -13,7 +13,7 @@ fn_print_information "starting ${gamename} server to generate configs." exitbypass=1 command_start.sh fn_firstcommand_reset -sleep 10 +fn_sleep_time_10 exitbypass=1 command_stop.sh fn_firstcommand_reset diff --git a/lgsm/modules/fix_ro.sh b/lgsm/modules/fix_ro.sh index 6ae485dbe..72864d699 100644 --- a/lgsm/modules/fix_ro.sh +++ b/lgsm/modules/fix_ro.sh @@ -7,16 +7,16 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" -echo -e "Applying webinterface ROOst.css fix." +echo -e "applying webinterface ROOst.css fix." echo -e "http://forums.tripwireinteractive.com/showpost.php?p=585435&postcount=13" sed -i 's/none}/none;/g' "${serverfiles}/Web/ServerAdmin/ROOst.css" sed -i 's/underline}/underline;/g' "${serverfiles}/Web/ServerAdmin/ROOst.css" fn_sleep_time -echo -e "Applying webinterface CharSet fix." +echo -e "applying webinterface CharSet fix." echo -e "http://forums.tripwireinteractive.com/showpost.php?p=442340&postcount=1" sed -i 's/CharSet="iso-8859-1"/CharSet="utf-8"/g' "${systemdir}/uweb.int" fn_sleep_time -echo -e "Applying Steam AppID fix." +echo -e "applying Steam AppID fix." sed -i 's/1210/1200/g' "${systemdir}/steam_appid.txt" fn_sleep_time echo -e "applying server name fix." @@ -26,14 +26,14 @@ fn_sleep_time exitbypass=1 command_start.sh fn_firstcommand_reset -sleep 5 +fn_sleep_time_5 exitbypass=1 command_stop.sh fn_firstcommand_reset exitbypass=1 command_start.sh fn_firstcommand_reset -sleep 5 +fn_sleep_time_5 exitbypass=1 command_stop.sh fn_firstcommand_reset diff --git a/lgsm/modules/fix_samp.sh b/lgsm/modules/fix_samp.sh index 24882f915..0b5d0ab22 100644 --- a/lgsm/modules/fix_samp.sh +++ b/lgsm/modules/fix_samp.sh @@ -15,7 +15,7 @@ if [ -f "${servercfgfullpath}" ]; then if [ "${currentpass}" == "${defaultpass}" ]; then fixname="change default rcon password" fn_fix_msg_start - fn_script_log_info "changing rcon/admin password." + fn_script_log_info "Changing rcon/admin password." randomstring=$(tr -dc 'A-Za-z0-9_' < /dev/urandom 2> /dev/null | head -c 8 | xargs) rconpass="admin${randomstring}" sed -i "s/rcon_password changeme/rcon_password ${rconpass}/g" "${servercfgfullpath}" @@ -27,7 +27,7 @@ if [ -f "${servercfgfullpath}" ]; then if [ "${currenthostname}" == "${defaulthostname}" ]; then fixname="change default hostname" fn_fix_msg_start - fn_script_log_info "changing default hostname to LinuxGSM" + fn_script_log_info "Changing default hostname to LinuxGSM" sed -i "s/hostname ${defaulthostname}/hostname LinuxGSM/g" "${servercfgfullpath}" fn_fix_msg_end fi diff --git a/lgsm/modules/fix_ut2k4.sh b/lgsm/modules/fix_ut2k4.sh index 2f7fc0d4d..5da1eee12 100644 --- a/lgsm/modules/fix_ut2k4.sh +++ b/lgsm/modules/fix_ut2k4.sh @@ -23,14 +23,14 @@ fn_sleep_time exitbypass=1 command_start.sh fn_firstcommand_reset -sleep 5 +fn_sleep_time_5 exitbypass=1 command_stop.sh fn_firstcommand_reset exitbypass=1 command_start.sh fn_firstcommand_reset -sleep 5 +fn_sleep_time_5 exitbypass=1 command_stop.sh fn_firstcommand_reset diff --git a/lgsm/modules/fix_ut3.sh b/lgsm/modules/fix_ut3.sh index d725de4a2..386833efc 100644 --- a/lgsm/modules/fix_ut3.sh +++ b/lgsm/modules/fix_ut3.sh @@ -13,7 +13,7 @@ fn_print_information "starting ${gamename} server to generate configs." exitbypass=1 command_start.sh fn_firstcommand_reset -sleep 10 +fn_sleep_time_10 exitbypass=1 command_stop.sh fn_firstcommand_reset diff --git a/lgsm/modules/info_messages.sh b/lgsm/modules/info_messages.sh index 3f0c6d235..c959df307 100644 --- a/lgsm/modules/info_messages.sh +++ b/lgsm/modules/info_messages.sh @@ -143,8 +143,8 @@ fn_info_message_server_resource() { { echo -e "${lightyellow}Storage${default}" echo -e "${lightblue}Filesystem:\t${default}${filesystem}" - echo -e "${lightblue}Total:\t\t${default}${totalspace}" - echo -e "${lightblue}Used:\t\t${default}${usedspace}" + echo -e "${lightblue}Total:\t${default}${totalspace}" + echo -e "${lightblue}Used:\t${default}${usedspace}" echo -e "${lightblue}Available:\t${default}${availspace}" } | column -s $'\t' -t echo -e "" diff --git a/lgsm/modules/install_config.sh b/lgsm/modules/install_config.sh index 1e3c243ab..258a7744a 100644 --- a/lgsm/modules/install_config.sh +++ b/lgsm/modules/install_config.sh @@ -11,7 +11,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_check_cfgdir() { if [ ! -d "${servercfgdir}" ]; then echo -e "creating ${servercfgdir} config directory." - fn_script_log_info "creating ${servercfgdir} config directory." + fn_script_log_info "Creating ${servercfgdir} config directory." mkdir -pv "${servercfgdir}" fi } @@ -25,7 +25,7 @@ fn_fetch_default_config() { echo -e "" echo -e "${italic}https://github.com/GameServerManagers/Game-Server-Configs${default}" echo -e "" - fn_sleep_time + fn_sleep_time_1 mkdir -p "${lgsmdir}/config-default/config-game" githuburl="https://raw.githubusercontent.com/GameServerManagers/Game-Server-Configs/main" for config in "${array_configs[@]}"; do @@ -38,7 +38,7 @@ fn_default_config_remote() { for config in "${array_configs[@]}"; do # every config is copied echo -e "copying ${config} config file." - fn_script_log_info "copying ${servercfg} config file." + fn_script_log_info "Copying ${servercfg} config file." if [ "${config}" == "${servercfgdefault}" ]; then mkdir -p "${servercfgdir}" cp -nv "${lgsmdir}/config-default/config-game/${config}" "${servercfgfullpath}" @@ -82,7 +82,7 @@ fn_set_config_vars() { servername="LinuxGSM" rconpass="admin${randomstring}" echo -e "changing hostname." - fn_script_log_info "changing hostname." + fn_script_log_info "Changing hostname." fn_sleep_time # prevents var from being overwritten with the servername. if grep -q "SERVERNAME=SERVERNAME" "${lgsmdir}/config-default/config-game/${config}" 2> /dev/null; then @@ -93,7 +93,7 @@ fn_set_config_vars() { sed -i "s/SERVERNAME/${servername}/g" "${servercfgfullpath}" fi echo -e "changing rcon/admin password." - fn_script_log_info "changing rcon/admin password." + fn_script_log_info "Changing rcon/admin password." if [ "${shortname}" == "squad" ]; then sed -i "s/ADMINPASSWORD/${rconpass}/g" "${servercfgdir}/Rcon.cfg" else @@ -112,15 +112,15 @@ fn_set_dst_config_vars() { ## cluster.ini if grep -Fq "SERVERNAME" "${clustercfgfullpath}"; then echo -e "changing server name." - fn_script_log_info "changing server name." + fn_script_log_info "Changing server name." sed -i "s/SERVERNAME/LinuxGSM/g" "${clustercfgfullpath}" fn_sleep_time echo -e "changing shard mode." - fn_script_log_info "changing shard mode." + fn_script_log_info "Changing shard mode." sed -i "s/USESHARDING/${sharding}/g" "${clustercfgfullpath}" fn_sleep_time echo -e "randomizing cluster key." - fn_script_log_info "randomizing cluster key." + fn_script_log_info "Randomizing cluster key." randomstring=$(tr -dc 'A-Za-z0-9_' < /dev/urandom 2> /dev/null | head -c 8 | xargs) sed -i "s/CLUSTERKEY/${randomstring}/g" "${clustercfgfullpath}" fn_sleep_time @@ -139,18 +139,18 @@ fn_set_dst_config_vars() { fi echo -e "changing shard name." - fn_script_log_info "changing shard name." + fn_script_log_info "Changing shard name." sed -i "s/SHARDNAME/${shard}/g" "${servercfgfullpath}" fn_sleep_time echo -e "changing master setting." - fn_script_log_info "changing master setting." + fn_script_log_info "Changing master setting." sed -i "s/ISMASTER/${master}/g" "${servercfgfullpath}" fn_sleep_time ## worldgenoverride.lua if [ "${cave}" == "true" ]; then echo -e "defining ${shard} as cave in ${servercfgdir}/worldgenoverride.lua." - fn_script_log_info "defining ${shard} as cave in ${servercfgdir}/worldgenoverride.lua." + fn_script_log_info "Defining ${shard} as cave in ${servercfgdir}/worldgenoverride.lua." echo 'return { override_enabled = true, preset = "DST_CAVE", }' > "${servercfgdir}/worldgenoverride.lua" fi fn_sleep_time diff --git a/lgsm/modules/install_eula.sh b/lgsm/modules/install_eula.sh index 7f0229bfa..7f7f95f35 100644 --- a/lgsm/modules/install_eula.sh +++ b/lgsm/modules/install_eula.sh @@ -30,10 +30,10 @@ if [ -z "${autoinstall}" ]; then fi elif [ "${commandname}" == "START" ]; then fn_print_info "By continuing you are indicating your agreement to the EULA." - sleep 5 + fn_sleep_time_5 else echo -e "By using auto-install you are indicating your agreement to the EULA." - sleep 5 + fn_sleep_time_5 fi if [ "${shortname}" == "ts3" ]; then diff --git a/lgsm/modules/install_gslt.sh b/lgsm/modules/install_gslt.sh index 772885d64..aa8d89d33 100644 --- a/lgsm/modules/install_gslt.sh +++ b/lgsm/modules/install_gslt.sh @@ -10,7 +10,6 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo -e "" echo -e "${bold}${lightyellow}Game Server Login Token${default}" fn_messages_separator -fn_sleep_time if [ "${shortname}" == "csgo" ] || [ "${shortname}" == "css" ] || [ "${shortname}" == "nmrih" ] || [ "${shortname}" == "bs" ]; then echo -e "GSLT is required to run a public ${gamename} server" fn_script_log_info "GSLT is required to run a public ${gamename} server" @@ -36,7 +35,7 @@ if [ -z "${autoinstall}" ]; then fi fi fi -fn_sleep_time + if [ "${shortname}" == "tu" ]; then echo -e "The GSLT can be changed by editing ${servercfgdir}/${servercfg}." fn_script_log_info "The GSLT can be changed by editing ${servercfgdir}/${servercfg}." @@ -44,4 +43,5 @@ else echo -e "The GSLT can be changed by editing ${configdirserver}/${selfname}.cfg." fn_script_log_info "The GSLT can be changed by editing ${configdirserver}/${selfname}.cfg." fi +fn_sleep_time_1 echo -e "" diff --git a/lgsm/modules/install_logs.sh b/lgsm/modules/install_logs.sh index 5b12dd3e1..294bc1e46 100644 --- a/lgsm/modules/install_logs.sh +++ b/lgsm/modules/install_logs.sh @@ -11,9 +11,7 @@ if [ "${checklogs}" != "1" ]; then echo -e "" echo -e "${bold}${lightyellow}Creating Log Directories${default}" fn_messages_separator - fn_sleep_time fi -fn_sleep_time # Create LinuxGSM logs. echo -en "installing log dir: ${logdir}..." mkdir -p "${logdir}" diff --git a/lgsm/modules/install_server_dir.sh b/lgsm/modules/install_server_dir.sh index 0136e52fc..0703e0c54 100644 --- a/lgsm/modules/install_server_dir.sh +++ b/lgsm/modules/install_server_dir.sh @@ -10,7 +10,6 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo -e "" echo -e "${bold}${lightyellow}Server Directory${default}" fn_messages_separator -fn_sleep_time if [ -d "${serverfiles}" ]; then fn_print_warning_nl "A server is already installed here." fi diff --git a/lgsm/modules/install_squad_license.sh b/lgsm/modules/install_squad_license.sh index 604b3bcad..28f4456a5 100644 --- a/lgsm/modules/install_squad_license.sh +++ b/lgsm/modules/install_squad_license.sh @@ -18,7 +18,7 @@ echo -e "https://squad.fandom.com/wiki/Server_licensing" fn_script_log_info "Get more info and a server license here:" fn_script_log_info "https://squad.fandom.com/wiki/Server_licensing" echo -e "" -fn_sleep_time +fn_sleep_time_1 echo -e "The Squad server license can be changed by editing ${servercfgdir}/License.cfg." fn_script_log_info "The Squad server license can be changed by editing ${selfname}." echo -e "" diff --git a/lgsm/modules/install_stats.sh b/lgsm/modules/install_stats.sh index c3e92323d..40a13434d 100644 --- a/lgsm/modules/install_stats.sh +++ b/lgsm/modules/install_stats.sh @@ -10,7 +10,6 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo -e "" echo -e "${bold}${lightyellow}LinuxGSM Stats${default}" fn_messages_separator -fn_sleep_time echo -e "Assist LinuxGSM development by sending anonymous stats to developers." echo -e "Collected data is publicly available: ${italic}https://linuxgsm.com/data/usage${default}" echo -e "More info: ${italic}https://docs.linuxgsm.com/configuration/linuxgsm-stats${default}" diff --git a/lgsm/modules/install_ts3db.sh b/lgsm/modules/install_ts3db.sh index e5776c30f..464bd686a 100644 --- a/lgsm/modules/install_ts3db.sh +++ b/lgsm/modules/install_ts3db.sh @@ -45,7 +45,7 @@ fn_install_ts3db_mariadb() { sed -i "s/dbpluginparameter=/dbpluginparameter=ts3db_mariadb.ini/g" "${servercfgfullpath}" sed -i "s/dbsqlcreatepath=create_sqlite\//dbsqlcreatepath=create_mariadb\//g" "${servercfgfullpath}" echo -e "updating ts3db_mariadb.ini." - fn_sleep_time + fn_sleep_time_1 } echo -e "" @@ -69,5 +69,5 @@ fn_print_information_nl "Key also saved in:" echo -e "${serverfiles}/privilege_key.txt" cd "${executabledir}" || exit ./ts3server_startscript.sh start inifile=ts3-server.ini 2>&1 | tee "${serverfiles}/privilege_key.txt" -sleep 5 +fn_sleep_time_5 ./ts3server_startscript.sh stop diff --git a/lgsm/modules/update_fctr.sh b/lgsm/modules/update_fctr.sh index 2eef0d4cd..8fb78ede3 100644 --- a/lgsm/modules/update_fctr.sh +++ b/lgsm/modules/update_fctr.sh @@ -104,7 +104,7 @@ fn_update_compare() { command_start.sh fn_firstcommand_reset exitbypass=1 - sleep 5 + fn_sleep_time_5 command_stop.sh fn_firstcommand_reset fi diff --git a/lgsm/modules/update_jk2.sh b/lgsm/modules/update_jk2.sh index f685fd4cb..e2715c01c 100644 --- a/lgsm/modules/update_jk2.sh +++ b/lgsm/modules/update_jk2.sh @@ -100,7 +100,7 @@ fn_update_compare() { command_start.sh fn_firstcommand_reset exitbypass=1 - sleep 5 + fn_sleep_time_5 command_stop.sh fn_firstcommand_reset fi diff --git a/lgsm/modules/update_mc.sh b/lgsm/modules/update_mc.sh index c4aa1b425..4a0bdde37 100644 --- a/lgsm/modules/update_mc.sh +++ b/lgsm/modules/update_mc.sh @@ -116,7 +116,7 @@ fn_update_compare() { command_start.sh fn_firstcommand_reset exitbypass=1 - sleep 5 + fn_sleep_time_5 command_stop.sh fn_firstcommand_reset fi diff --git a/lgsm/modules/update_mcb.sh b/lgsm/modules/update_mcb.sh index eb8adfd12..7bd273d66 100644 --- a/lgsm/modules/update_mcb.sh +++ b/lgsm/modules/update_mcb.sh @@ -122,7 +122,7 @@ fn_update_compare() { command_start.sh fn_firstcommand_reset exitbypass=1 - sleep 5 + fn_sleep_time_5 command_stop.sh fn_firstcommand_reset fi diff --git a/lgsm/modules/update_mta.sh b/lgsm/modules/update_mta.sh index cd1195563..c6f7dfcb0 100644 --- a/lgsm/modules/update_mta.sh +++ b/lgsm/modules/update_mta.sh @@ -108,7 +108,7 @@ fn_update_compare() { command_start.sh fn_firstcommand_reset exitbypass=1 - sleep 5 + fn_sleep_time_5 command_stop.sh fn_firstcommand_reset fi diff --git a/lgsm/modules/update_pmc.sh b/lgsm/modules/update_pmc.sh index 9bfa82101..5d44bee21 100644 --- a/lgsm/modules/update_pmc.sh +++ b/lgsm/modules/update_pmc.sh @@ -126,7 +126,7 @@ fn_update_compare() { command_start.sh fn_firstcommand_reset exitbypass=1 - sleep 5 + fn_sleep_time_5 command_stop.sh fn_firstcommand_reset fi diff --git a/lgsm/modules/update_ts3.sh b/lgsm/modules/update_ts3.sh index c00ae75cb..1fa77f428 100644 --- a/lgsm/modules/update_ts3.sh +++ b/lgsm/modules/update_ts3.sh @@ -108,7 +108,7 @@ fn_update_compare() { command_start.sh fn_firstcommand_reset exitbypass=1 - sleep 5 + fn_sleep_time_5 command_stop.sh fn_firstcommand_reset fi diff --git a/lgsm/modules/update_ut99.sh b/lgsm/modules/update_ut99.sh index bdd3631f3..6d0be1941 100644 --- a/lgsm/modules/update_ut99.sh +++ b/lgsm/modules/update_ut99.sh @@ -102,7 +102,7 @@ fn_update_compare() { command_start.sh fn_firstcommand_reset exitbypass=1 - sleep 5 + fn_sleep_time_5 command_stop.sh fn_firstcommand_reset fi diff --git a/lgsm/modules/update_vints.sh b/lgsm/modules/update_vints.sh index b38372058..403917e0c 100644 --- a/lgsm/modules/update_vints.sh +++ b/lgsm/modules/update_vints.sh @@ -109,7 +109,7 @@ fn_update_compare() { command_start.sh fn_firstcommand_reset exitbypass=1 - sleep 5 + fn_sleep_time_5 command_stop.sh fn_firstcommand_reset fi diff --git a/linuxgsm.sh b/linuxgsm.sh index 520373d48..20adc1db6 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -323,17 +323,18 @@ fn_install_file() { # Prevent LinuxGSM from running as root. Except if doing a dependency install. if [ "$(whoami)" == "root" ]; then - if [ "${userinput}" == "install" ] || [ "${userinput}" == "auto-install" ] || [ "${userinput}" == "i" ] || [ "${userinput}" == "ai" ]; then - if [ "${shortname}" == "core" ]; then - echo -e "[ FAIL ] Do NOT run this script as root!" - exit 1 + if [ -f "${modulesdir}/core_modules.sh" ] || [ -f "${modulesdir}/check_root.sh" ] || [ -f "${modulesdir}/core_messages.sh" ]; then + if [ "${userinput}" != "install" ] && [ "${userinput}" != "auto-install" ] && [ "${userinput}" != "i" ] && [ "${userinput}" != "ai" ]; then + core_modules.sh + core_messages.sh + fn_ansi_loader + check_root.sh fi - elif [ ! -f "${modulesdir}/core_modules.sh" ] || [ ! -f "${modulesdir}/check_root.sh" ] || [ ! -f "${modulesdir}/core_messages.sh" ]; then - echo -e "[ FAIL ] Do NOT run this script as root!" - exit 1 else - core_modules.sh - check_root.sh + if [ "${userinput}" != "install" ] && [ "${userinput}" != "auto-install" ] && [ "${userinput}" != "i" ] && [ "${userinput}" != "ai" ]; then + echo -e "[ FAIL ] Do NOT run as root!" + exit 1 + fi fi fi