Pārlūkot izejas kodu

Merge branch 'develop' into feature/alerts-refactor

Daniel Gibbs 4 gadi atpakaļ
vecāks
revīzija
94c910fe6b
55 mainītis faili ar 3074 papildinājumiem un 898 dzēšanām
  1. 2 2
      .github/FUNDING.yml
  2. 1 1
      .github/ISSUE_TEMPLATE/new-server-request.md
  3. 98 0
      .github/labeler.yml
  4. 3 0
      .github/pr-labeler.yml
  5. 0 4
      .github/topissuebot.yml
  6. 1 1
      .github/workflows/create-release.yml
  7. 14 0
      .github/workflows/label-sponsors.yml
  8. 2 7
      .github/workflows/labeler.yml
  9. 2 2
      .github/workflows/lock.yml
  10. 14 0
      .github/workflows/pr-labeler.yml
  11. 0 4
      .github/write-good.yml
  12. 0 44
      .travis.yml
  13. 106 46
      CODE_OF_CONDUCT.md
  14. 7 7
      CONTRIBUTING.md
  15. 3 3
      README.md
  16. 186 0
      lgsm/config-default/config-lgsm/dodrserver/_default.cfg
  17. 10 7
      lgsm/config-default/config-lgsm/loserver/_default.cfg
  18. 0 1
      lgsm/config-default/config-lgsm/pstbsserver/_default.cfg
  19. 186 0
      lgsm/config-default/config-lgsm/stnserver/_default.cfg
  20. 122 0
      lgsm/data/almalinux-8.csv
  21. 122 0
      lgsm/data/centos-7.csv
  22. 121 0
      lgsm/data/centos-8.csv
  23. 122 0
      lgsm/data/debian-10.csv
  24. 122 0
      lgsm/data/debian-11.csv
  25. 122 0
      lgsm/data/debian-9.csv
  26. 122 0
      lgsm/data/rhel-7.csv
  27. 122 0
      lgsm/data/rhel-8.csv
  28. 122 0
      lgsm/data/rocky-8.csv
  29. 2 0
      lgsm/data/serverlist.csv
  30. 122 0
      lgsm/data/ubuntu-16.04.csv
  31. 122 0
      lgsm/data/ubuntu-18.04.csv
  32. 122 0
      lgsm/data/ubuntu-20.04.csv
  33. 122 0
      lgsm/data/ubuntu-21.04.csv
  34. 3 2
      lgsm/functions/alert_telegram.sh
  35. 1 1
      lgsm/functions/check.sh
  36. 221 488
      lgsm/functions/check_deps.sh
  37. 16 5
      lgsm/functions/check_ip.sh
  38. 3 8
      lgsm/functions/command_debug.sh
  39. 33 0
      lgsm/functions/command_update_linuxgsm.sh
  40. 115 31
      lgsm/functions/core_dl.sh
  41. 1 1
      lgsm/functions/core_functions.sh
  42. 1 1
      lgsm/functions/core_getopt.sh
  43. 14 0
      lgsm/functions/fix_vh.sh
  44. 110 95
      lgsm/functions/info_distro.sh
  45. 236 116
      lgsm/functions/info_game.sh
  46. 39 2
      lgsm/functions/info_messages.sh
  47. 13 1
      lgsm/functions/install_config.sh
  48. 0 1
      lgsm/functions/install_server_dir.sh
  49. 2 1
      lgsm/functions/install_server_files.sh
  50. 30 2
      lgsm/functions/mods_list.sh
  51. 1 1
      linuxgsm.sh
  52. 1 1
      tests/tests_fctrserver.sh
  53. 4 4
      tests/tests_jc2server.sh
  54. 7 7
      tests/tests_mcserver.sh
  55. 1 1
      tests/tests_ts3server.sh

+ 2 - 2
.github/FUNDING.yml

@@ -1,7 +1,7 @@
 # These are supported funding model platforms
 # These are supported funding model platforms
 
 
 github: dgibbs64 # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 github: dgibbs64 # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
+patreon: dgibbs # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 otechie: # Replace with a single Otechie username
-custom: [paypal.me/dgibbs64] # Replace with a single custom sponsorship URL
+custom: # Replace with a single custom sponsorship URL

+ 1 - 1
.github/ISSUE_TEMPLATE/new-server-request.md

@@ -7,7 +7,7 @@ assignees: ''
 
 
 ---
 ---
 
 
-## What game server would you like adding?
+## What game server would you like to add?
 
 
 [game server]
 [game server]
 
 

+ 98 - 0
.github/labeler.yml

@@ -0,0 +1,98 @@
+# Add/remove 'critical' label if issue contains the words 'urgent' or 'critical'
+# Type
+"type: game server request":
+    - '/(Server Request)/i'
+"type: bug":
+    - '/(bug)/i'
+"type: feature request":
+    - '/(feature)/i'
+# Commands
+"command: backup":
+    - '/(backup)/i'
+"command: console":
+    - '/(console|tmux)/i'
+"command: debug":
+    - '/(debug)/i'
+"command: details":
+    - '/(details)/i'
+"command: fast-dl":
+    - '/(fast-dl|fastdl)/i'
+"command: install":
+    - '/(install)/i'
+"command: mods":
+    - '/(mods)/i'
+"command: monitor":
+    - '/(monitor)/i'
+"command: post-details":
+    - '/(post-details)/i'
+"command: restart":
+    - '/(restart)/i'
+"command: send":
+    - '/(send)/i'
+"command: skeleton":
+    - '/(skeleton)/i'
+"command: start":
+    - '/(start)/i'
+"command: stop":
+    - '/(stop)/i'
+"command: update-lgsm":
+    - '/(update-lgsm)/i'
+"command: update":
+    - '/(update)/i'
+"command: validate":
+    - '/(validate)/i'
+"command: wipe":
+    - '/(wipe)/i'
+# Distros
+"distro: AlmaLinux":
+    - '/(Alma)/i'
+"distro: Arch Linux":
+    - '/(Arch)/i'
+"distro: CentOS":
+    - '/(CentOS)/i'
+"distro: Debian":
+    - '/(Debian)/i'
+"distro: Fedora":
+    - '/(Fedora)/i'
+"distro: openSUSE":
+    - '/(openSUSE|suse)/i'
+"distro: Rocky Linux":
+    - '/(Rocky)/i'
+"distro: Slackware":
+    - '/(Slackware)/i'
+"distro: Ubuntu":
+    - '/(Ubuntu)/i'
+# Info
+"info: alerts":
+    - '/(alert)/i'
+"info: dependency":
+    - '/(dependency|deps)/i'
+"info: docker":
+    - '/(docker)/i'
+"info: docs":
+    - '/(documentation|docs)/i'
+"info: email":
+    - '/(postfix|sendmail|exim|smtp)/i'
+"info: query":
+    - '/(gamedig|gsquery)/i'
+"info: steamcmd":
+    - '/(steamcmd)/i'
+"info: systemd":
+    - '/(systemd)/i'
+"info: tmux":
+    - '/(tmux)/i'
+"info: website":
+    - '/(website)/i'
+# Games
+"game: Ark: Survival Evolved":
+    - '/(Ark: Survival Evolved|Ark)/i'
+"game: ARMA 3":
+    - '/(ARMA 3)/i'
+"game: Assetto Corsa":
+    - '/(Assetto Corsa)/i'
+"game: Avorion":
+    - '/(Avorion)/i'
+"game: Ballistic Overkill":
+    - '/(Ballistic Overkill)/i'
+"game: Barotrauma":
+    - '/(Barotrauma)/i'

+ 3 - 0
.github/pr-labeler.yml

@@ -0,0 +1,3 @@
+feature: ['feature/*', 'feat/*']
+hotfix: hotfix/*
+release: release/*

+ 0 - 4
.github/topissuebot.yml

@@ -1,4 +0,0 @@
-# Configuration for top-issue-bot
-labelName: ":thumbsup: Top Issue!"
-labelColor: "f442c2"
-numberOfIssuesToLabel: 5

+ 1 - 1
.github/workflows/create-release.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
     steps:
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "master"
       # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v5.15.0
         with:
         with:
           config-name: release-drafter.yml
           config-name: release-drafter.yml
         env:
         env:

+ 14 - 0
.github/workflows/label-sponsors.yml

@@ -0,0 +1,14 @@
+name: Label sponsors
+on:
+  pull_request:
+    types: [opened]
+  issues:
+    types: [opened]
+jobs:
+  build:
+    name: is-sponsor-label
+    runs-on: ubuntu-latest
+    steps:
+      - uses: JasonEtco/is-sponsor-label-action@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 2 - 7
.github/workflows/labeler.yml


+ 2 - 2
.github/workflows/lock.yml

@@ -2,13 +2,13 @@ name: 'Lock Threads'
 
 
 on:
 on:
   schedule:
   schedule:
-    - cron: '0 0 * * *'     
+    - cron: '0 0 * * *'
 
 
 jobs:
 jobs:
   lock:
   lock:
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
     steps:
     steps:
-      - uses: dessant/lock-threads@v2.0.3
+      - uses: dessant/lock-threads@v2.1.2
         with:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
           issue-lock-comment: >
           issue-lock-comment: >

+ 14 - 0
.github/workflows/pr-labeler.yml

@@ -0,0 +1,14 @@
+name: PR Labeler
+on:
+  pull_request:
+    types: [opened, edited, closed]
+
+jobs:
+  pr-labeler:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: TimonVS/pr-labeler-action@v3
+        with:
+          configuration-path: .github/pr-labeler.yml # optional, .github/pr-labeler.yml is the default value
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

+ 0 - 4
.github/write-good.yml

@@ -1,4 +0,0 @@
-# .github/write-good.yml
-writeGood: true
-alex: true
-spellchecker: true

+ 0 - 44
.travis.yml

@@ -1,44 +0,0 @@
-language: node_js
-dist: bionic
-node_js:
-  - "stable"
-env:
-  global:
-    secure: VsS98cwJ5X/Ev3HEm7KEOPftYay+7jNTHepTS7d+gQNHcDR1UYKTmqlQNSIoUC52Ejs1cHq43jOfle4330zDPOYI0v5BMri6/iZKpmMxAw6KWNiUgSkziTP2kHC4NRLwEoU2WQTI3JZQjrBEfsPmD81+yR/eWXV3rph+YcSOxao=
-
-before_script:
-  - curl -L "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/shunit2/shunit2-2.1.6.tgz" | tar zx
-
-install:
-  - npm install gamedig
-
-addons:
-  apt:
-    packages:
-    - mailutils
-    - postfix
-    - jq
-    - lib32gcc1
-    - lib32stdc++6
-    - shellcheck
-    - libcurl4-openssl-dev
-    - libdw-dev
-    - cmake
-
-jobs:
-  include:
-    - stage: "Jobs"
-      name: "code coverage"
-      script: bash tests/tests_kcov.sh; kcov --bash-method=DEBUG coverage tests/tests_mcserver.sh
-    - script: bash tests/tests_mcserver.sh
-      name: "Minecraft"
-    - script: bash tests/tests_jc2server.sh
-      name: "Just Cause 2"
-    - script: bash tests/tests_fctrserver.sh
-      name: "Factorio"
-    - script: bash tests/tests_ts3server.sh
-      name: "Teamspeak 3"
-    - script: bash tests/tests_defaultcfg/tests_defaultcfg.sh
-      name: "_default.cfg checks"
-after_success:
-- bash <(curl -Ls https://coverage.codacy.com/get.sh)

+ 106 - 46
CODE_OF_CONDUCT.md

@@ -1,73 +1,133 @@
+
 # Contributor Covenant Code of Conduct
 # Contributor Covenant Code of Conduct
 
 
 ## Our Pledge
 ## Our Pledge
 
 
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 
 ## Our Standards
 ## Our Standards
 
 
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
 
-*  Using welcoming and inclusive language
-*  Being respectful of differing viewpoints and experiences
-*  Gracefully accepting constructive criticism
-*  Focusing on what is best for the community
-*  Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
 
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
 
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
 
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 
 ## Scope
 ## Scope
 
 
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 
 ## Enforcement
 ## Enforcement
 
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at me@danielgibbs.co.uk. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
+reported to the community leaders responsible for enforcement at
+[INSERT CONTACT METHOD].
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
 
 
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
 
 
 ## Attribution
 ## Attribution
 
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
 
 
-[homepage]: https://www.contributor-covenant.org
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
 
 
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
+at [https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

+ 7 - 7
CONTRIBUTING.md

@@ -35,7 +35,7 @@ The following is a set of guidelines for contributing to LinuxGSM, which are hos
 
 
 ## Code of Conduct
 ## Code of Conduct
 
 
-This project and everyone participating in it are governed by the [LinuxGSM Code of Conduct](https://github.com/GameServerManagers/linuxgsm/blob/master/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behaviour to [daniel.gibbs@linuxgsm.com](mailto:daniel.gibbs@linuxgsm.com).
+This project and everyone participating in it is governed by the [LinuxGSM Code of Conduct](https://github.com/GameServerManagers/linuxgsm/blob/master/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behaviour to [daniel.gibbs@linuxgsm.com](mailto:daniel.gibbs@linuxgsm.com).
 
 
 ## 🎉 Bug/Enhancement Contributions 🐛
 ## 🎉 Bug/Enhancement Contributions 🐛
 
 
@@ -87,7 +87,7 @@ Features are tracked as [GitHub issues](https://guides.github.com/features/issue
 This section guides you through submitting a game server request for LinuxGSM, Following these guidelines help maintainers and the community understand your game server request 📝.
 This section guides you through submitting a game server request for LinuxGSM, Following these guidelines help maintainers and the community understand your game server request 📝.
 #### Before Submitting a Game Server Request
 #### Before Submitting a Game Server Request
 
 
-* **Check for existing** [**game server requests**](https://github.com/GameServerManagers/LinuxGSM/labels/type%3A%20game%20server%20request) to see if the new game server has already been suggested. If it has **and if the new game server is still open**, give it a thumbs.
+* **Check for existing** [**game server requests**](https://github.com/GameServerManagers/LinuxGSM/labels/type%3A%20game%20server%20request) to see if the new game server has already been suggested. If it has **and if the new game server is still open**, give it a thumbs up.
 * **Check the game server is supported on Linux**, this does not include Wine servers which we do not support.
 * **Check the game server is supported on Linux**, this does not include Wine servers which we do not support.
 #### How Do I Submit A (Good) Game Server Request?
 #### How Do I Submit A (Good) Game Server Request?
 * The title should be as follows: **[Server Request] Game Name**
 * The title should be as follows: **[Server Request] Game Name**
@@ -98,9 +98,9 @@ This section guides you through submitting a game server request for LinuxGSM, F
 
 
 LinuxGSM is a management script that acts as a wrapper around game servers. These game servers are developed by different game developers such as Valve, Epic and Facepunch to name a few.
 LinuxGSM is a management script that acts as a wrapper around game servers. These game servers are developed by different game developers such as Valve, Epic and Facepunch to name a few.
 
 
-LinuxGSM has no control over the development and limited knowledge of issues directly relating to the game servers themselves. The same also applies for any mods, add-ons, maps etc.
+LinuxGSM has no control over the development and limited knowledge of issues directly relating to the game servers themselves. The same also applies to any mods, add-ons, maps etc.
 
 
-If there is an issue with a specific game server or mod the best action may be to contact the game/mod developers on there support forums. If it is unclear some community members should be able to help.
+If there is an issue with a specific game server or mod the best action may be to contact the game/mod developers on their support forums. If it is unclear some community members should be able to help.
 
 
 A [list](https://docs.linuxgsm.com/support/game-server) of known game developer forums is available on the [LinuxGSM docs](https://docs.linuxgsm.com/support/game-server).
 A [list](https://docs.linuxgsm.com/support/game-server) of known game developer forums is available on the [LinuxGSM docs](https://docs.linuxgsm.com/support/game-server).
 
 
@@ -157,7 +157,7 @@ Below is an example of the subject line for a pull request:
 ### Testing
 ### Testing
 
 
 #### Pull Request Status Checks
 #### Pull Request Status Checks
-When a Pull Request is submitted, a series of status check tests are conducted.  These tests will asses the code quality, complete CI tests etc. To get your PR merged these status checks must pass.
+When a Pull Request is submitted, a series of status check tests are conducted.  These tests will assess the code quality, complete CI tests etc. To get your PR merged these status checks must pass.
 
 
 #### Test Environment
 #### Test Environment
 It is recommended that you have a testing environment available to test your code during development. To test your own code you must change some variables within the `linuxgsm.sh` file. This will force the use of your own code branch.
 It is recommended that you have a testing environment available to test your code during development. To test your own code you must change some variables within the `linuxgsm.sh` file. This will force the use of your own code branch.
@@ -197,10 +197,10 @@ This section lists the labels we use to help us track and manage issues and pull
 [GitHub search](https://help.github.com/articles/searching-issues/) makes it easy to use labels for finding groups of issues or pull requests you're interested in. There are several categories of labels available:
 [GitHub search](https://help.github.com/articles/searching-issues/) makes it easy to use labels for finding groups of issues or pull requests you're interested in. There are several categories of labels available:
 
 
 **command** Labels
 **command** Labels
-Highlights the LinuxGSM command the Issue/PR relates too.
+Highlights the LinuxGSM command the Issue/PR relates to.
 
 
 **info** Labels
 **info** Labels
-Labels to help pinpoint what the issue or PR relates too.
+Labels to help pinpoint what the issue or PR relates to.
 
 
 variants:
 variants:
 * _distro_
 * _distro_

+ 3 - 3
README.md

@@ -35,7 +35,7 @@ Other distros are likely to work but are not fully tested.
 
 
 ## :wrench: Requirements
 ## :wrench: Requirements
 
 
-Each game server has its own specific dependency requirements. Visit a specific game server installation page on the [LinuxGSM](https://linuxgsm.com) website to check dependency requirements for the game server you want to install.
+Each game server has specific dependency requirements. Visit a specific game server installation page on the [LinuxGSM](https://linuxgsm.com) website to check dependency requirements for the game server you want to install.
 
 
 ## :blue_book: Documentation
 ## :blue_book: Documentation
 
 
@@ -43,11 +43,11 @@ Documentation is found at [linuxgsm.com](https://linuxgsm.com) and [docs.linuxgs
 
 
 ## :question: Support
 ## :question: Support
 
 
-There are a various ways to get support, check out the [support](https://linuxgsm.com/support/) page to the right support.
+There are various ways to get support, check out the [support](https://linuxgsm.com/support/) page to the right support.
 
 
 ## :heart: Sponsor
 ## :heart: Sponsor
 
 
-If you would like to [sponsor](https://linuxgsm.com/sponsor) to the project there are several ways you can, via [GitHub Sponsors](https://github.com/sponsors/dgibbs64) and [PayPal](https://www.paypal.me/dgibbs64). I would like to thank everyone who has previously sent a donation. Since 2012 LinuxGSM has been steadily growing with new servers, features and improvements added regularly.
+If you would like to [sponsor](https://linuxgsm.com/sponsor) to the project there are several ways you can, via [GitHub Sponsors](https://github.com/sponsors/dgibbs64) and [PayPal](https://www.paypal.me/dgibbs64). I would like to thank everyone who sponsors me. Since 2012 LinuxGSM has been steadily growing with new servers, features and improvements added regularly.
 
 
 ## Contributors
 ## Contributors
 
 

+ 186 - 0
lgsm/config-default/config-lgsm/dodrserver/_default.cfg

@@ -0,0 +1,186 @@
+##################################
+######## 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 ####
+
+## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
+servername="LinuxGSM"
+ip="0.0.0.0"
+port="7777"
+queryport="27015"
+
+## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
+startparameters="-MultiHome=${ip} -Port=${port} -QueryPort=${queryport} -SteamServerName='${servername}' -log"
+
+#### LinuxGSM Settings ####
+
+## LinuxGSM Stats
+# Send useful stats to LinuxGSM developers.
+# https://docs.linuxgsm.com/configuration/linuxgsm-stats
+# (on|off)
+stats="off"
+
+## Notification Alerts
+# (on|off)
+
+# Display IP | https://docs.linuxgsm.com/alerts#display-ip
+displayip=""
+
+# More info | https://docs.linuxgsm.com/alerts#more-info
+postalert="off"
+
+# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
+discordalert="off"
+discordwebhook="webhook"
+
+# Email Alerts | https://docs.linuxgsm.com/alerts/email
+emailalert="off"
+email="email@example.com"
+emailfrom=""
+
+# Gotify Alerts | https://docs.linuxgsm.com/alerts/gotify
+gotifyalert="off"
+gotifytoken="token"
+gotifywebhook="webhook"
+
+# IFTTT Alerts | https://docs.linuxgsm.com/alerts/ifttt
+iftttalert="off"
+ifttttoken="accesstoken"
+iftttevent="linuxgsm_alert"
+
+# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
+mailgunalert="off"
+mailgunapiregion="us"
+mailguntoken="accesstoken"
+mailgundomain="example.com"
+mailgunemailfrom="alert@example.com"
+mailgunemail="email@myemail.com"
+
+# Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
+pushbulletalert="off"
+pushbullettoken="accesstoken"
+channeltag=""
+
+# Pushover Alerts | https://docs.linuxgsm.com/alerts/pushover
+pushoveralert="off"
+pushovertoken="accesstoken"
+pushoveruserkey="userkey"
+
+# Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
+rocketchatalert="off"
+rocketchatwebhook="webhook"
+rocketchattoken=""
+
+# Slack Alerts | https://docs.linuxgsm.com/alerts/slack
+slackalert="off"
+slackwebhook="webhook"
+
+# 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".
+telegramapi="api.telegram.org"
+telegramalert="off"
+telegramtoken="accesstoken"
+telegramchatid=""
+curlcustomstring=""
+
+## Updating | https://docs.linuxgsm.com/commands/update
+updateonstart="off"
+
+## Backup | https://docs.linuxgsm.com/commands/backup
+maxbackups="4"
+maxbackupdays="30"
+stoponbackup="on"
+
+## Logging | https://docs.linuxgsm.com/features/logging
+consolelogging="on"
+logdays="7"
+
+## Monitor | https://docs.linuxgsm.com/commands/monitor
+# Query delay time
+querydelay="1"
+
+## ANSI Colors | https://docs.linuxgsm.com/features/ansi-colors
+ansi="on"
+
+#### Advanced Settings ####
+
+## Message Display Time | https://docs.linuxgsm.com/features/message-display-time
+sleeptime="0.5"
+
+## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
+# Server appid
+appid="1088320"
+steamcmdforcewindows="no"
+# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
+branch=""
+betapassword=""
+# Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
+steammaster="false"
+
+## 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
+stopmode="2"
+
+## Query mode
+# 1: session only
+# 2: gamedig (gsquery fallback)
+# 3: gamedig
+# 4: gsquery
+# 5: tcp
+querymode="2"
+querytype="protocol-valve"
+
+## Console type
+consoleverbose="yes"
+consoleinteract="no"
+
+## Game Server Details
+# Do not edit
+gamename="Day of Dragons"
+engine="unreal4"
+glibc="2.17"
+
+#### Directories ####
+# Edit with care
+
+## Game Server Directories
+systemdir="${serverfiles}/Dragons"
+executabledir="${systemdir}/Binaries/Linux"
+executable="./DragonsServer-Linux-Shipping"
+servercfgdir="${systemdir}/Saved/Config/LinuxServer"
+servercfg="Game.ini"
+servercfgdefault="Game.ini"
+servercfgfullpath="${servercfgdir}/${servercfg}"
+
+## Backup Directory
+backupdir="${lgsmdir}/backup"
+
+## Logging Directories
+logdir="${rootdir}/log"
+gamelogdir="${systemdir}/Saved/Logs"
+lgsmlogdir="${logdir}/script"
+consolelogdir="${logdir}/console"
+lgsmlog="${lgsmlogdir}/${selfname}-script.log"
+consolelog="${consolelogdir}/${selfname}-console.log"
+alertlog="${lgsmlogdir}/${selfname}-alert.log"
+postdetailslog="${lgsmlogdir}/${selfname}-postdetails.log"
+
+## Logs Naming
+lgsmlogdate="${lgsmlogdir}/${selfname}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+consolelogdate="${consolelogdir}/${selfname}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"

+ 10 - 7
lgsm/config-default/config-lgsm/loserver/_default.cfg

@@ -8,12 +8,9 @@
 
 
 #### Game Server Settings ####
 #### Game Server Settings ####
 
 
-## SteamCMD Login | https://docs.linuxgsm.com/steamcmd#steamcmd-login
-steamuser="username"
-steampass='password'
-
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
-servername="LinuxGSM"
+## https://docs.linuxgsm.com/game-servers/last-oasis
+servername="${selfname}"
 ip="0.0.0.0"
 ip="0.0.0.0"
 port="7777"
 port="7777"
 queryport="27015"
 queryport="27015"
@@ -22,7 +19,8 @@ providerkey=""
 slots="100"
 slots="100"
 
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="-log -force_steamclient_link -messaging -NoLiveServer -EnableCheats -backendapiurloverride='backend.last-oasis.com' -identifier=${servername} -port=${port} -CustomerKey=${customerkey} -ProviderKey=${providerkey} -slots=${slots} -QueryPort=${queryport} -OverrideConnectionAddress=${ip}"
+# For specific IP use: -OverrideConnectionAddress=${ip}
+startparameters="-log -force_steamclient_link -messaging -NoLiveServer -EnableCheats -backendapiurloverride="backend.last-oasis.com" -identifier=${servername} -port=${port} -CustomerKey=${customerkey} -ProviderKey=${providerkey} -slots=${slots} -QueryPort=${queryport}"
 
 
 #### LinuxGSM Settings ####
 #### LinuxGSM Settings ####
 
 
@@ -50,6 +48,11 @@ emailalert="off"
 email="email@example.com"
 email="email@example.com"
 emailfrom=""
 emailfrom=""
 
 
+# Gotify Alerts | https://docs.linuxgsm.com/alerts/gotify
+gotifyalert="off"
+gotifytoken="token"
+gotifywebhook="webhook"
+
 # IFTTT Alerts | https://docs.linuxgsm.com/alerts/ifttt
 # IFTTT Alerts | https://docs.linuxgsm.com/alerts/ifttt
 iftttalert="off"
 iftttalert="off"
 ifttttoken="accesstoken"
 ifttttoken="accesstoken"
@@ -185,4 +188,4 @@ postdetailslog="${lgsmlogdir}/${selfname}-postdetails.log"
 
 
 ## Logs Naming
 ## Logs Naming
 lgsmlogdate="${lgsmlogdir}/${selfname}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 lgsmlogdate="${lgsmlogdir}/${selfname}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
-consolelogdate="${consolelogdir}/${selfname}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+consolelogdate="${consolelogdir}/${selfname}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"

+ 0 - 1
lgsm/config-default/config-lgsm/pstbsserver/_default.cfg

@@ -14,7 +14,6 @@ port="10027"
 queryport="10037"
 queryport="10037"
 rconport="21114"
 rconport="21114"
 randommap="NONE"
 randommap="NONE"
-#servername="LinuxGSM Server"
 maxplayers="40"
 maxplayers="40"
 reservedslots="0"
 reservedslots="0"
 
 

+ 186 - 0
lgsm/config-default/config-lgsm/stnserver/_default.cfg

@@ -0,0 +1,186 @@
+##################################
+######## 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 ####
+maxplayers="20"
+# Regions: USA: 0, EU: 1, AUS: 2
+region="0"
+
+## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
+# Edit with care | https://colonysurvival.gamepedia.com/Dedicated_Server#Installation_.28Linux.29
+startparameters="-mc ${maxplayers} -r ${region}"
+
+#### LinuxGSM Settings ####
+
+## LinuxGSM Stats
+# Send useful stats to LinuxGSM developers.
+# https://docs.linuxgsm.com/configuration/linuxgsm-stats
+# (on|off)
+stats="off"
+
+## Notification Alerts
+# (on|off)
+
+# Display IP | https://docs.linuxgsm.com/alerts#display-ip
+displayip=""
+
+# More info | https://docs.linuxgsm.com/alerts#more-info
+postalert="off"
+
+# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
+discordalert="off"
+discordwebhook="webhook"
+
+# Email Alerts | https://docs.linuxgsm.com/alerts/email
+emailalert="off"
+email="email@example.com"
+emailfrom=""
+
+# Gotify Alerts | https://docs.linuxgsm.com/alerts/gotify
+gotifyalert="off"
+gotifytoken="token"
+gotifywebhook="webhook"
+
+# IFTTT Alerts | https://docs.linuxgsm.com/alerts/ifttt
+iftttalert="off"
+ifttttoken="accesstoken"
+iftttevent="linuxgsm_alert"
+
+# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
+mailgunalert="off"
+mailgunapiregion="us"
+mailguntoken="accesstoken"
+mailgundomain="example.com"
+mailgunemailfrom="alert@example.com"
+mailgunemail="email@myemail.com"
+
+# Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
+pushbulletalert="off"
+pushbullettoken="accesstoken"
+channeltag=""
+
+# Pushover Alerts | https://docs.linuxgsm.com/alerts/pushover
+pushoveralert="off"
+pushovertoken="accesstoken"
+pushoveruserkey="userkey"
+
+# Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
+rocketchatalert="off"
+rocketchatwebhook="webhook"
+rocketchattoken=""
+
+# Slack Alerts | https://docs.linuxgsm.com/alerts/slack
+slackalert="off"
+slackwebhook="webhook"
+
+# 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".
+telegramapi="api.telegram.org"
+telegramalert="off"
+telegramtoken="accesstoken"
+telegramchatid=""
+curlcustomstring=""
+
+## Updating | https://docs.linuxgsm.com/commands/update
+updateonstart="off"
+
+## Backup | https://docs.linuxgsm.com/commands/backup
+maxbackups="4"
+maxbackupdays="30"
+stoponbackup="on"
+
+## Logging | https://docs.linuxgsm.com/features/logging
+consolelogging="on"
+logdays="7"
+
+## Monitor | https://docs.linuxgsm.com/commands/monitor
+# Query delay time
+querydelay="1"
+
+## ANSI Colors | https://docs.linuxgsm.com/features/ansi-colors
+ansi="on"
+
+#### Advanced Settings ####
+
+## Message Display Time | https://docs.linuxgsm.com/features/message-display-time
+sleeptime="0.5"
+
+## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
+# Server appid
+appid="1502300"
+steamcmdforcewindows="no"
+# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
+branch=""
+betapassword=""
+# Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
+steammaster="false"
+
+## 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
+stopmode="2"
+
+## Query mode
+# 1: session only
+# 2: gamedig (gsquery fallback)
+# 3: gamedig
+# 4: gsquery
+# 5: tcp
+querymode="2"
+querytype="protocol-valve"
+
+## Console type
+consoleverbose="yes"
+consoleinteract="no"
+
+## Game Server Details
+# Do not edit
+gamename="Survive the Nights"
+engine="unity3d"
+glibc="2.15"
+
+#### Directories ####
+# Edit with care
+
+## Game Server Directories
+systemdir="${serverfiles}"
+executabledir="${serverfiles}"
+executable="./Server_Linux_x64"
+servercfgdir="${systemdir}/Config"
+servercfg="ServerConfig.txt"
+servercfgdefault="ServerConfig.txt"
+servercfgfullpath="${servercfgdir}/${servercfg}"
+
+## Backup Directory
+backupdir="${lgsmdir}/backup"
+
+## Logging Directories
+logdir="${rootdir}/log"
+gamelogdir="${serverfiles}"
+lgsmlogdir="${logdir}/script"
+consolelogdir="${logdir}/console"
+gamelog="${gamelogdir}/${selfname}-game.log"
+lgsmlog="${lgsmlogdir}/${selfname}-script.log"
+consolelog="${consolelogdir}/${selfname}-console.log"
+alertlog="${lgsmlogdir}/${selfname}-alert.log"
+postdetailslog="${lgsmlogdir}/${selfname}-postdetails.log"
+
+## Logs Naming
+gamelogdate="${gamelogdir}/${selfname}-game-$(date '+%Y-%m-%d-%H:%M:%S').log"
+lgsmlogdate="${lgsmlogdir}/${selfname}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+consolelogdate="${consolelogdir}/${selfname}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"

+ 122 - 0
lgsm/data/almalinux-8.csv

@@ -0,0 +1,122 @@
+all,bc,binutils,bzip2,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+steamcmd,glibc.i686,libstdc++.i686
+ac
+ahl
+ahl2
+ark
+arma3
+av
+bb
+bb2,libcurl.i686
+bd
+bf1942,ncurses-libs.i686
+bfv,compat-libstdc++-33.i686,glibc.i686
+bmdm,ncurses-libs.i686
+bo
+bs
+bt,libicu
+bt1944
+cc
+cmw
+cod,compat-libstdc++-33.i686
+cod2,compat-libstdc++-33.i686
+cod4
+coduo,compat-libstdc++-33.i686
+codwaw
+col
+cs
+cscz
+csgo
+css,ncurses-libs.i686
+dab
+dmc
+dod
+dodr
+dods
+doi
+dst,libcurl.i686
+dys
+eco,libgdiplus
+em
+etl
+fctr
+fof
+gmod,ncurses-libs.i686
+hl2dm
+hldm
+hldms
+hw,zlib-devel
+ins
+inss
+ios
+jc2
+jc3
+jk2
+kf
+kf2
+lo
+l4d
+l4d2
+mc,java-11-openjdk
+mcb,libnsl
+mh
+mohaa,compat-libstdc++-33.i686
+mom
+mta
+mumble
+nd
+nmrih,ncurses-libs.i686
+ns
+ns2,speex,tbb
+ns2c,speex.i686,tbb.i686
+onset,mariadb-connector-c
+opfor
+pc
+pmc,java-11-openjdk
+pstbs,GConf2
+pvkii
+pvr,libcxx
+pz,java-11-openjdk rng-tools
+q2
+q3
+ql
+qw
+ricochet
+ro
+rtcw
+rust,zlib-devel
+rw,java-11-openjdk
+samp
+sb
+sbots
+scpsl
+scpslsm
+sdtd,telnet,expect
+sfc,ncurses-libs.i686
+sof2
+sol
+squad
+st
+stn
+sven
+terraria
+tf2,libcurl.i686
+tfc
+ts
+ts3
+tu
+tw
+unt
+ut
+ut2k4
+ut3
+ut99
+vh,glibc-devel
+vs
+vints,mono-complete
+wet
+wf
+wmc,java-11-openjdk
+wurm,xorg-x11-server-Xvfb
+zmr,ncurses-libs.i686
+zps,ncurses-libs.i686

+ 122 - 0
lgsm/data/centos-7.csv

@@ -0,0 +1,122 @@
+all,bc,binutils,bzip2,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+steamcmd,glibc.i686,libstdc++.i686
+ac
+ahl
+ahl2
+ark
+arma3
+av
+bb
+bb2,libcurl.i686
+bd
+bf1942,ncurses-libs.i686
+bfv,compat-libstdc++-33.i686,glibc.i686
+bmdm,ncurses-libs.i686
+bo
+bs
+bt,libicu
+bt1944
+cc
+cmw
+cod,compat-libstdc++-33.i686
+cod2,compat-libstdc++-33.i686
+cod4
+coduo,compat-libstdc++-33.i686
+codwaw
+col
+cs
+cscz
+csgo
+css,ncurses-libs.i686
+dab
+dmc
+dod
+dodr
+dods
+doi
+dst,libcurl.i686
+dys
+eco,libgdiplus
+em
+etl
+fctr
+fof
+gmod,ncurses-libs.i686
+hl2dm
+hldm
+hldms
+hw,zlib-devel
+ins
+inss
+ios
+jc2
+jc3
+jk2
+kf
+kf2
+lo
+l4d
+l4d2
+mc,java-11-openjdk
+mcb,libnsl
+mh
+mohaa,compat-libstdc++-33.i686
+mom
+mta
+mumble
+nd
+nmrih,ncurses-libs.i686
+ns
+ns2,speex,tbb
+ns2c,speex.i686,tbb.i686
+onset,mariadb-connector-c
+opfor
+pc
+pmc,java-11-openjdk
+pstbs,GConf2
+pvkii
+pvr,libcxx
+pz,java-11-openjdk rng-tools
+q2
+q3
+ql
+qw
+ricochet
+ro
+rtcw
+rust,zlib-devel
+rw,java-11-openjdk
+samp
+sb
+sbots
+scpsl
+scpslsm
+sdtd,telnet,expect
+sfc,ncurses-libs.i686
+sof2
+sol
+squad
+st
+stn
+sven
+terraria
+tf2,libcurl.i686
+tfc
+ts
+ts3
+tu
+tw
+unt
+ut
+ut2k4
+ut3
+ut99
+vh,glibc-devel
+vs
+vints,mono-complete
+wet
+wf
+wmc,java-11-openjdk
+wurm,xorg-x11-server-Xvfb
+zmr,ncurses-libs.i686
+zps,ncurses-libs.i686

+ 121 - 0
lgsm/data/centos-8.csv

@@ -0,0 +1,121 @@
+all,bc,binutils,bzip2,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+steamcmd,glibc.i686,libstdc++.i686
+ac
+ahl
+ahl2
+ark
+arma3
+av
+bb
+bb2,libcurl.i686
+bd
+bf1942,ncurses-libs.i686
+bfv,compat-libstdc++-33.i686,glibc.i686
+bmdm,ncurses-libs.i686
+bo
+bs
+bt,libicu
+bt1944
+cc
+cmw
+cod,compat-libstdc++-33.i686
+cod2,compat-libstdc++-33.i686
+cod4
+coduo,compat-libstdc++-33.i686
+codwaw
+col
+cs
+cscz
+csgo
+css,ncurses-libs.i686
+dab
+dmc
+dod
+dodr
+dods
+doi
+dst,libcurl.i686
+dys
+eco,libgdiplus
+em
+etl
+fctr
+fof
+gmod,ncurses-libs.i686
+hl2dm
+hldm
+hldms
+hw,zlib-devel
+ins
+inss
+ios
+jc2
+jc3
+jk2
+kf
+kf2
+lo
+l4d
+l4d2
+mc,java-11-openjdk
+mcb,libnsl
+mh
+mohaa,compat-libstdc++-33.i686
+mom
+mta
+mumble
+nd
+nmrih,ncurses-libs.i686
+ns
+ns2,speex,tbb
+ns2c,speex.i686,tbb.i686
+onset,mariadb-connector-c
+opfor
+pc
+pmc,java-11-openjdk
+pstbs,GConf2
+pvkii
+pvr,libcxx
+pz,java-11-openjdk rng-tools
+q2
+q3
+ql
+qw
+ricochet
+ro
+rtcw
+rust,zlib-devel
+rw,java-11-openjdk
+samp
+sb
+sbots
+scpsl
+scpslsm
+sdtd,telnet,expect
+sfc,ncurses-libs.i686
+sof2
+sol
+squad
+st
+sven
+terraria
+tf2,libcurl.i686
+tfc
+ts
+ts3
+tu
+tw
+unt
+ut
+ut2k4
+ut3
+ut99
+vh,glibc-devel
+vs
+vints,mono-complete
+wet
+wf
+wmc,java-11-openjdk
+wurm,xorg-x11-server-Xvfb
+zmr,ncurses-libs.i686
+zps,ncurses-libs.i686

+ 122 - 0
lgsm/data/debian-10.csv

@@ -0,0 +1,122 @@
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
+ac
+ahl
+ahl2
+ark
+arma3
+av
+bb
+bb2,libcurl4-gnutls-dev:i386
+bd
+bf1942,libncurses5:i386,libtinfo5:i386
+bfv,libncurses5:i386,libstdc++5:i386
+bmdm,libncurses5:i386
+bo
+bs
+bt,libicu-dev
+bt1944
+cc
+cmw
+cod,libstdc++5:i386
+cod2,libstdc++5:i386
+cod4
+coduo,libstdc++5:i386
+codwaw
+col
+cs
+cscz
+csgo
+css,libtinfo5:i386
+dab
+dmc
+dod
+dodr
+dods
+doi
+dst,libcurl4-gnutls-dev:i386
+dys
+eco,libgdiplus
+em
+etl
+fctr
+fof
+gmod,libtinfo5:i386
+hl2dm
+hldm
+hldms
+hw,lib32z1
+ins
+inss
+ios
+jc2
+jc3
+jk2
+kf
+kf2
+lo
+l4d
+l4d2
+mc,openjdk-11-jre
+mcb
+mh
+mohaa,libstdc++5:i386
+mom
+mta
+mumble
+nd
+nmrih,libtinfo5:i386
+ns
+ns2,speex,libtbb2
+ns2c,speex:i386,libtbb2
+onset,libmariadbclient-dev
+opfor
+pc
+pmc,openjdk-11-jre
+pstbs,libgconf-2-4
+pvkii
+pvr,libc++1
+pz,openjdk-11-jre,rng-tools
+q2
+q3
+ql
+qw
+ricochet
+ro
+rtcw
+rust,lib32z1
+rw,openjdk-11-jre
+samp
+sb
+sbots
+scpsl,mono-complete
+scpslsm,mono-complete
+sdtd,telnet,expect
+sfc,libtinfo5:i386
+sof2
+sol
+squad
+st
+stn
+sven,libssl1.1:i386,zlib1g:i386
+terraria
+tf2,libcurl4-gnutls-dev:i386
+tfc
+ts
+ts3
+tu
+tw
+unt
+ut
+ut2k4
+ut3
+ut99
+vh,libc6-dev
+vs
+vints,mono-complete
+wet
+wf
+wmc,openjdk-11-jre
+wurm,xvfb
+zmr,libtinfo5:i386
+zps,libtinfo5:i386

+ 122 - 0
lgsm/data/debian-11.csv

@@ -0,0 +1,122 @@
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+steamcmd,lib32gcc-s1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
+ac
+ahl
+ahl2
+ark
+arma3
+av
+bb
+bb2,libcurl4-gnutls-dev:i386
+bd
+bf1942,libncurses5:i386,libtinfo5:i386
+bfv,libncurses5:i386,libstdc++5:i386
+bmdm,libncurses5:i386
+bo
+bs
+bt,libicu-dev
+bt1944
+cc
+cmw
+cod,libstdc++5:i386
+cod2,libstdc++5:i386
+cod4
+coduo,libstdc++5:i386
+codwaw
+col
+cs
+cscz
+csgo
+css,libtinfo5:i386
+dab
+dmc
+dod
+dodr
+dods
+doi
+dst,libcurl4-gnutls-dev:i386
+dys
+eco,libgdiplus
+em
+etl
+fctr
+fof
+gmod,libtinfo5:i386
+hl2dm
+hldm
+hldms
+hw,lib32z1
+ins
+inss
+ios
+jc2
+jc3
+jk2
+kf
+kf2
+lo
+l4d
+l4d2
+mc,openjdk-16-jre
+mcb
+mh
+mohaa,libstdc++5:i386
+mom
+mta
+mumble
+nd
+nmrih,libtinfo5:i386
+ns
+ns2,speex,libtbb2
+ns2c,speex:i386,libtbb2
+onset,libmariadbclient-dev
+opfor
+pc
+pmc,openjdk-16-jre
+pstbs,libgconf-2-4
+pvkii
+pvr,libc++1
+pz,openjdk-16-jre,rng-tools
+q2
+q3
+ql
+qw
+ricochet
+ro
+rtcw
+rust,lib32z1
+rw,openjdk-16-jre
+samp
+sb
+sbots
+scpsl,mono-complete
+scpslsm,mono-complete
+sdtd,telnet,expect
+sfc,libtinfo5:i386
+sof2
+sol
+squad
+st
+stn
+sven,libssl1.1:i386,zlib1g:i386
+terraria
+tf2,libcurl4-gnutls-dev:i386
+tfc
+ts
+ts3
+tu
+tw
+unt
+ut
+ut2k4
+ut3
+ut99
+vh,libc6-dev
+vs
+vints,mono-complete
+wet
+wf
+wmc,openjdk-16-jre
+wurm,xvfb
+zmr,libtinfo5:i386
+zps,libtinfo5:i386

+ 122 - 0
lgsm/data/debian-9.csv

@@ -0,0 +1,122 @@
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
+ac
+ahl
+ahl2
+ark
+arma3
+av
+bb
+bb2,libcurl4-gnutls-dev:i386
+bd
+bf1942,libncurses5:i386,libtinfo5:i386
+bfv,libncurses5:i386,libstdc++5:i386
+bmdm,libncurses5:i386
+bo
+bs
+bt,libicu-dev
+bt1944
+cc
+cmw
+cod,libstdc++5:i386
+cod2,libstdc++5:i386
+cod4
+coduo,libstdc++5:i386
+codwaw
+col
+cs
+cscz
+csgo
+css,libtinfo5:i386
+dab
+dmc
+dod
+dodr
+dods
+doi
+dst,libcurl4-gnutls-dev:i386
+dys
+eco,libgdiplus
+em
+etl
+fctr
+fof
+gmod,libtinfo5:i386
+hl2dm
+hldm
+hldms
+hw,lib32z1
+ins
+inss
+ios
+jc2
+jc3
+jk2
+kf
+kf2
+lo
+l4d
+l4d2
+mc,openjdk-8-jre
+mcb
+mh
+mohaa,libstdc++5:i386
+mom
+mta
+mumble
+nd
+nmrih,libtinfo5:i386
+ns
+ns2,speex,libtbb2
+ns2c,speex:i386,libtbb2
+onset,libmariadbclient-dev
+opfor
+pc
+pmc,openjdk-8-jre
+pstbs,libgconf-2-4
+pvkii
+pvr,libc++1
+pz,openjdk-8-jre,rng-tools
+q2
+q3
+ql
+qw
+ricochet
+ro
+rtcw
+rust,lib32z1
+rw,openjdk-8-jre
+samp
+sb
+sbots
+scpsl,mono-complete
+scpslsm,mono-complete
+sdtd,telnet,expect
+sfc,libtinfo5:i386
+sof2
+sol
+squad
+st
+stn
+sven,libssl1.1:i386,zlib1g:i386
+terraria
+tf2,libcurl4-gnutls-dev:i386
+tfc
+ts
+ts3
+tu
+tw
+unt
+ut
+ut2k4
+ut3
+ut99
+vh,libc6-dev
+vs
+vints,mono-complete
+wet
+wf
+wmc,openjdk-8-jre
+wurm,xvfb
+zmr,libtinfo5:i386
+zps,libtinfo5:i386

+ 122 - 0
lgsm/data/rhel-7.csv

@@ -0,0 +1,122 @@
+all,bc,binutils,bzip2,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+steamcmd,glibc.i686,libstdc++.i686
+ac
+ahl
+ahl2
+ark
+arma3
+av
+bb
+bb2,libcurl.i686
+bd
+bf1942,ncurses-libs.i686
+bfv,compat-libstdc++-33.i686,glibc.i686
+bmdm,ncurses-libs.i686
+bo
+bs
+bt,libicu
+bt1944
+cc
+cmw
+cod,compat-libstdc++-33.i686
+cod2,compat-libstdc++-33.i686
+cod4
+coduo,compat-libstdc++-33.i686
+codwaw
+col
+cs
+cscz
+csgo
+css,ncurses-libs.i686
+dab
+dmc
+dod
+dodr
+dods
+doi
+dst,libcurl.i686
+dys
+eco,libgdiplus
+em
+etl
+fctr
+fof
+gmod,ncurses-libs.i686
+hl2dm
+hldm
+hldms
+hw,zlib-devel
+ins
+inss
+ios
+jc2
+jc3
+jk2
+kf
+kf2
+lo
+l4d
+l4d2
+mc,java-11-openjdk
+mcb,libnsl
+mh
+mohaa,compat-libstdc++-33.i686
+mom
+mta
+mumble
+nd
+nmrih,ncurses-libs.i686
+ns
+ns2,speex,tbb
+ns2c,speex.i686,tbb.i686
+onset,mariadb-connector-c
+opfor
+pc
+pmc,java-11-openjdk
+pstbs,GConf2
+pvkii
+pvr,libcxx
+pz,java-11-openjdk rng-tools
+q2
+q3
+ql
+qw
+ricochet
+ro
+rtcw
+rust,zlib-devel
+rw,java-11-openjdk
+samp
+sb
+sbots
+scpsl
+scpslsm
+sdtd,telnet,expect
+sfc,ncurses-libs.i686
+sof2
+sol
+squad
+st
+stn
+sven
+terraria
+tf2,libcurl.i686
+tfc
+ts
+ts3
+tu
+tw
+unt
+ut
+ut2k4
+ut3
+ut99
+vh,glibc-devel
+vs
+vints,mono-complete
+wet
+wf
+wmc,java-11-openjdk
+wurm,xorg-x11-server-Xvfb
+zmr,ncurses-libs.i686
+zps,ncurses-libs.i686

+ 122 - 0
lgsm/data/rhel-8.csv

@@ -0,0 +1,122 @@
+all,bc,binutils,bzip2,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+steamcmd,glibc.i686,libstdc++.i686
+ac
+ahl
+ahl2
+ark
+arma3
+av
+bb
+bb2,libcurl.i686
+bd
+bf1942,ncurses-libs.i686
+bfv,compat-libstdc++-33.i686,glibc.i686
+bmdm,ncurses-libs.i686
+bo
+bs
+bt,libicu
+bt1944
+cc
+cmw
+cod,compat-libstdc++-33.i686
+cod2,compat-libstdc++-33.i686
+cod4
+coduo,compat-libstdc++-33.i686
+codwaw
+col
+cs
+cscz
+csgo
+css,ncurses-libs.i686
+dab
+dmc
+dod
+dodr
+dods
+doi
+dst,libcurl.i686
+dys
+eco,libgdiplus
+em
+etl
+fctr
+fof
+gmod,ncurses-libs.i686
+hl2dm
+hldm
+hldms
+hw,zlib-devel
+ins
+inss
+ios
+jc2
+jc3
+jk2
+kf
+kf2
+lo
+l4d
+l4d2
+mc,java-11-openjdk
+mcb,libnsl
+mh
+mohaa,compat-libstdc++-33.i686
+mom
+mta
+mumble
+nd
+nmrih,ncurses-libs.i686
+ns
+ns2,speex,tbb
+ns2c,speex.i686,tbb.i686
+onset,mariadb-connector-c
+opfor
+pc
+pmc,java-11-openjdk
+pstbs,GConf2
+pvkii
+pvr,libcxx
+pz,java-11-openjdk rng-tools
+q2
+q3
+ql
+qw
+ricochet
+ro
+rtcw
+rust,zlib-devel
+rw,java-11-openjdk
+samp
+sb
+sbots
+scpsl
+scpslsm
+sdtd,telnet,expect
+sfc,ncurses-libs.i686
+sof2
+sol
+squad
+st
+stn
+sven
+terraria
+tf2,libcurl.i686
+tfc
+ts
+ts3
+tu
+tw
+unt
+ut
+ut2k4
+ut3
+ut99
+vh,glibc-devel
+vs
+vints,mono-complete
+wet
+wf
+wmc,java-11-openjdk
+wurm,xorg-x11-server-Xvfb
+zmr,ncurses-libs.i686
+zps,ncurses-libs.i686

+ 122 - 0
lgsm/data/rocky-8.csv

@@ -0,0 +1,122 @@
+all,bc,binutils,bzip2,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+steamcmd,glibc.i686,libstdc++.i686
+ac
+ahl
+ahl2
+ark
+arma3
+av
+bb
+bb2,libcurl.i686
+bd
+bf1942,ncurses-libs.i686
+bfv,compat-libstdc++-33.i686,glibc.i686
+bmdm,ncurses-libs.i686
+bo
+bs
+bt,libicu
+bt1944
+cc
+cmw
+cod,compat-libstdc++-33.i686
+cod2,compat-libstdc++-33.i686
+cod4
+coduo,compat-libstdc++-33.i686
+codwaw
+col
+cs
+cscz
+csgo
+css,ncurses-libs.i686
+dab
+dmc
+dod
+dodr
+dods
+doi
+dst,libcurl.i686
+dys
+eco,libgdiplus
+em
+etl
+fctr
+fof
+gmod,ncurses-libs.i686
+hl2dm
+hldm
+hldms
+hw,zlib-devel
+ins
+inss
+ios
+jc2
+jc3
+jk2
+kf
+kf2
+lo
+l4d
+l4d2
+mc,java-11-openjdk
+mcb,libnsl
+mh
+mohaa,compat-libstdc++-33.i686
+mom
+mta
+mumble
+nd
+nmrih,ncurses-libs.i686
+ns
+ns2,speex,tbb
+ns2c,speex.i686,tbb.i686
+onset,mariadb-connector-c
+opfor
+pc
+pmc,java-11-openjdk
+pstbs,GConf2
+pvkii
+pvr,libcxx
+pz,java-11-openjdk rng-tools
+q2
+q3
+ql
+qw
+ricochet
+ro
+rtcw
+rust,zlib-devel
+rw,java-11-openjdk
+samp
+sb
+sbots
+scpsl
+scpslsm
+sdtd,telnet,expect
+sfc,ncurses-libs.i686
+sof2
+sol
+squad
+st
+stn
+sven
+terraria
+tf2,libcurl.i686
+tfc
+ts
+ts3
+tu
+tw
+unt
+ut
+ut2k4
+ut3
+ut99
+vh,glibc-devel
+vs
+vints,mono-complete
+wet
+wf
+wmc,java-11-openjdk
+wurm,xorg-x11-server-Xvfb
+zmr,ncurses-libs.i686
+zps,ncurses-libs.i686

+ 2 - 0
lgsm/data/serverlist.csv

@@ -29,6 +29,7 @@ css,cssserver,Counter-Strike: Source
 dab,dabserver,Double Action: Boogaloo
 dab,dabserver,Double Action: Boogaloo
 dmc,dmcserver,Deathmatch Classic
 dmc,dmcserver,Deathmatch Classic
 dod,dodserver,Day of Defeat
 dod,dodserver,Day of Defeat
+dodr,dodrserver,Day of Dragons
 dods,dodsserver,Day of Defeat: Source
 dods,dodsserver,Day of Defeat: Source
 doi,doiserver,Day of Infamy
 doi,doiserver,Day of Infamy
 dst,dstserver,Don't Starve Together
 dst,dstserver,Don't Starve Together
@@ -94,6 +95,7 @@ sof2,sof2server,Soldier Of Fortune 2: Gold Edition
 sol,solserver,Soldat
 sol,solserver,Soldat
 squad,squadserver,Squad
 squad,squadserver,Squad
 st,stserver,Stationeers
 st,stserver,Stationeers
+stn,stnserver,Survive the Nights
 sven,svenserver,Sven Co-op
 sven,svenserver,Sven Co-op
 terraria,terrariaserver,Terraria
 terraria,terrariaserver,Terraria
 tf2,tf2server,Team Fortress 2
 tf2,tf2server,Team Fortress 2

+ 122 - 0
lgsm/data/ubuntu-16.04.csv

@@ -0,0 +1,122 @@
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
+ac
+ahl
+ahl2
+ark
+arma3
+av
+bb
+bb2,libcurl4-gnutls-dev:i386
+bd
+bf1942,libncurses5:i386,libtinfo5:i386
+bfv,libncurses5:i386,libstdc++5:i386
+bmdm,libncurses5:i386
+bo
+bs
+bt,libicu-dev
+bt1944
+cc
+cmw
+cod,libstdc++5:i386
+cod2,libstdc++5:i386
+cod4
+coduo,libstdc++5:i386
+codwaw
+col
+cs
+cscz
+csgo
+css,libtinfo5:i386
+dab
+dmc
+dod
+dodr
+dods
+doi
+dst,libcurl4-gnutls-dev:i386
+dys
+eco,libgdiplus
+em
+etl
+fctr
+fof
+gmod,libtinfo5:i386
+hl2dm
+hldm
+hldms
+hw,lib32z1
+ins
+inss
+ios
+jc2
+jc3
+jk2
+kf
+kf2
+lo
+l4d
+l4d2
+mc,openjdk-8-jre
+mcb
+mh
+mohaa,libstdc++5:i386
+mom
+mta
+mumble
+nd
+nmrih,libtinfo5:i386
+ns
+ns2,speex,libtbb2
+ns2c,speex:i386,libtbb2
+onset,libmariadbclient-dev
+opfor
+pc
+pmc,openjdk-8-jre
+pstbs,libgconf-2-4
+pvkii
+pvr,libc++1
+pz,openjdk-8-jre,rng-tools
+q2
+q3
+ql
+qw
+ricochet
+ro
+rtcw
+rust,lib32z1
+rw,openjdk-8-jre
+samp
+sb
+sbots
+scpsl,mono-complete
+scpslsm,mono-complete
+sdtd,telnet,expect
+sfc,libtinfo5:i386
+sof2
+sol
+squad
+st
+stn
+sven,libssl1.1:i386,zlib1g:i386
+terraria
+tf2,libcurl4-gnutls-dev:i386
+tfc
+ts
+ts3
+tu
+tw
+unt
+ut
+ut2k4
+ut3
+ut99
+vh,libc6-dev
+vs
+vints,mono-complete
+wet
+wf
+wmc,openjdk-8-jre
+wurm,xvfb
+zmr,libtinfo5:i386
+zps,libtinfo5:i386

+ 122 - 0
lgsm/data/ubuntu-18.04.csv

@@ -0,0 +1,122 @@
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
+ac
+ahl
+ahl2
+ark
+arma3
+av
+bb
+bb2,libcurl4-gnutls-dev:i386
+bd
+bf1942,libncurses5:i386,libtinfo5:i386
+bfv,libncurses5:i386,libstdc++5:i386
+bmdm,libncurses5:i386
+bo
+bs
+bt,libicu-dev
+bt1944
+cc
+cmw
+cod,libstdc++5:i386
+cod2,libstdc++5:i386
+cod4
+coduo,libstdc++5:i386
+codwaw
+col
+cs
+cscz
+csgo
+css,libtinfo5:i386
+dab
+dmc
+dod
+dodr
+dods
+doi
+dst,libcurl4-gnutls-dev:i386
+dys
+eco,libgdiplus
+em
+etl
+fctr
+fof
+gmod,libtinfo5:i386
+hl2dm
+hldm
+hldms
+hw,lib32z1
+ins
+inss
+ios
+jc2
+jc3
+jk2
+kf
+kf2
+lo
+l4d
+l4d2
+mc,openjdk-11-jre
+mcb
+mh
+mohaa,libstdc++5:i386
+mom
+mta
+mumble
+nd
+nmrih,libtinfo5:i386
+ns
+ns2,speex,libtbb2
+ns2c,speex:i386,libtbb2
+onset,libmariadbclient-dev
+opfor
+pc
+pmc,openjdk-11-jre
+pstbs,libgconf-2-4
+pvkii
+pvr,libc++1
+pz,openjdk-11-jre,rng-tools
+q2
+q3
+ql
+qw
+ricochet
+ro
+rtcw
+rust,lib32z1
+rw,openjdk-11-jre
+samp
+sb
+sbots
+scpsl,mono-complete
+scpslsm,mono-complete
+sdtd,telnet,expect
+sfc,libtinfo5:i386
+sof2
+sol
+squad
+st
+stn
+sven,libssl1.1:i386,zlib1g:i386
+terraria
+tf2,libcurl4-gnutls-dev:i386
+tfc
+ts
+ts3
+tu
+tw
+unt
+ut
+ut2k4
+ut3
+ut99
+vh,libc6-dev
+vs
+vints,mono-complete
+wet
+wf
+wmc,openjdk-11-jre
+wurm,xvfb
+zmr,libtinfo5:i386
+zps,libtinfo5:i386

+ 122 - 0
lgsm/data/ubuntu-20.04.csv

@@ -0,0 +1,122 @@
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
+ac
+ahl
+ahl2
+ark
+arma3
+av
+bb
+bb2,libcurl4-gnutls-dev:i386
+bd
+bf1942,libncurses5:i386,libtinfo5:i386
+bfv,libncurses5:i386,libstdc++5:i386
+bmdm,libncurses5:i386
+bo
+bs
+bt,libicu-dev
+bt1944
+cc
+cmw
+cod,libstdc++5:i386
+cod2,libstdc++5:i386
+cod4
+coduo,libstdc++5:i386
+codwaw
+col
+cs
+cscz
+csgo
+css,libtinfo5:i386
+dab
+dmc
+dod
+dodr
+dods
+doi
+dst,libcurl4-gnutls-dev:i386
+dys
+eco,libgdiplus
+em
+etl
+fctr
+fof
+gmod,libtinfo5:i386
+hl2dm
+hldm
+hldms
+hw,lib32z1
+ins
+inss
+ios
+jc2
+jc3
+jk2
+kf
+kf2
+lo
+l4d
+l4d2
+mc,openjdk-16-jre
+mcb
+mh
+mohaa,libstdc++5:i386
+mom
+mta
+mumble
+nd
+nmrih,libtinfo5:i386
+ns
+ns2,speex,libtbb2
+ns2c,speex:i386,libtbb2
+onset,libmariadbclient-dev
+opfor
+pc
+pmc,openjdk-16-jre
+pstbs,libgconf-2-4
+pvkii
+pvr,libc++1
+pz,openjdk-16-jre,rng-tools
+q2
+q3
+ql
+qw
+ricochet
+ro
+rtcw
+rust,lib32z1
+rw,openjdk-16-jre
+samp
+sb
+sbots
+scpsl,mono-complete
+scpslsm,mono-complete
+sdtd,telnet,expect
+sfc,libtinfo5:i386
+sof2
+sol
+squad
+st
+stn
+sven,libssl1.1:i386,zlib1g:i386
+terraria
+tf2,libcurl4-gnutls-dev:i386
+tfc
+ts
+ts3
+tu
+tw
+unt
+ut
+ut2k4
+ut3
+ut99
+vh,libc6-dev
+vs
+vints,mono-complete
+wet
+wf
+wmc,openjdk-16-jre
+wurm,xvfb
+zmr,libtinfo5:i386
+zps,libtinfo5:i386

+ 122 - 0
lgsm/data/ubuntu-21.04.csv

@@ -0,0 +1,122 @@
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+steamcmd,lib32gcc-s1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
+ac
+ahl
+ahl2
+ark
+arma3
+av
+bb
+bb2,libcurl4-gnutls-dev:i386
+bd
+bf1942,libncurses5:i386,libtinfo5:i386
+bfv,libncurses5:i386,libstdc++5:i386
+bmdm,libncurses5:i386
+bo
+bs
+bt,libicu-dev
+bt1944
+cc
+cmw
+cod,libstdc++5:i386
+cod2,libstdc++5:i386
+cod4
+coduo,libstdc++5:i386
+codwaw
+col
+cs
+cscz
+csgo
+css,libtinfo5:i386
+dab
+dmc
+dod
+dodr
+dods
+doi
+dst,libcurl4-gnutls-dev:i386
+dys
+eco,libgdiplus
+em
+etl
+fctr
+fof
+gmod,libtinfo5:i386
+hl2dm
+hldm
+hldms
+hw,lib32z1
+ins
+inss
+ios
+jc2
+jc3
+jk2
+kf
+kf2
+lo
+l4d
+l4d2
+mc,openjdk-16-jre
+mcb
+mh
+mohaa,libstdc++5:i386
+mom
+mta
+mumble
+nd
+nmrih,libtinfo5:i386
+ns
+ns2,speex,libtbb2
+ns2c,speex:i386,libtbb2
+onset,libmariadbclient-dev
+opfor
+pc
+pmc,openjdk-16-jre
+pstbs,libgconf-2-4
+pvkii
+pvr,libc++1
+pz,openjdk-16-jre,rng-tools
+q2
+q3
+ql
+qw
+ricochet
+ro
+rtcw
+rust,lib32z1
+rw,openjdk-16-jre
+samp
+sb
+sbots
+scpsl,mono-complete
+scpslsm,mono-complete
+sdtd,telnet,expect
+sfc,libtinfo5:i386
+sof2
+sol
+squad
+st
+stn
+sven,libssl1.1:i386,zlib1g:i386
+terraria,libsdl
+tf2,libcurl4-gnutls-dev:i386
+tfc
+ts
+ts3
+tu
+tw
+unt
+ut
+ut2k4
+ut3
+ut99
+vh,libc6-dev
+vs
+vints,mono-complete
+wet
+wf
+wmc,openjdk-16-jre
+wurm,xvfb
+zmr,libtinfo5:i386
+zps,libtinfo5:i386

+ 3 - 2
lgsm/functions/alert_telegram.sh

@@ -11,8 +11,9 @@ json=$(cat <<EOF
 {
 {
 	"chat_id": "${telegramchatid}",
 	"chat_id": "${telegramchatid}",
 	"parse_mode": "HTML",
 	"parse_mode": "HTML",
-	"text": "<b>${alertemoji} ${alerttitle} ${alertemoji}</b>\n\n<b>Server name</b>\n${servername}\n\n<b>Message</b>\n${alertmessage}\n\n<b>Game</b>\n${gamename}\n\n<b>Server IP</b>\n<a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a>\n\n<b>Hostname</b>\n${HOSTNAME}\n\n<b>More info</b>\n<a href='${alerturl}'>${alerturl}</a>",
-	"disable_web_page_preview": "yes",
+	"text": "<b>${alertemoji} ${alertsubject} ${alertemoji}</b>\n\n<b>Server name</b>\n${servername}\n\n<b>Message</b>\n${alertbody}\n\n<b>Game</b>\n${gamename}\n\n<b>Server IP</b>\n<a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a>\n\n<b>Hostname</b>\n${HOSTNAME}\n\n<b>More info</b>\n<a href='${alerturl}'>${alerturl}</a>",
+	"disable_web_page_preview": "yes"
+}
 EOF
 EOF
 )
 )
 
 

+ 1 - 1
lgsm/functions/check.sh

@@ -54,7 +54,7 @@ for allowed_command in "${allowed_commands_array[@]}"; do
 	fi
 	fi
 done
 done
 
 
-allowed_commands_array=( DEBUG START STOP )
+allowed_commands_array=( DEBUG START )
 for allowed_command in "${allowed_commands_array[@]}"; do
 for allowed_command in "${allowed_commands_array[@]}"; do
 	if [ "${allowed_command}" == "${commandname}" ]; then
 	if [ "${allowed_command}" == "${commandname}" ]; then
 		check_deps.sh
 		check_deps.sh

+ 221 - 488
lgsm/functions/check_deps.sh

@@ -3,204 +3,85 @@
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
 # Website: https://linuxgsm.com
-# Description: Checks if required dependencies are installed for LinuxGSM.
+# Description: Checks and installs missing dependencies.
 
 
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 
 fn_install_mono_repo(){
 fn_install_mono_repo(){
-	if [ "${monostatus}" != "0" ]; then
-		fn_print_dots "Adding Mono repository"
-		if [ "${autoinstall}" == "1" ]; then
-			sudo -n true > /dev/null 2>&1
-		else
-			sudo -v > /dev/null 2>&1
-		fi
-		if [ $? -eq 0 ]; then
-			fn_print_info_nl "Automatically adding Mono repository."
-			fn_script_log_info "Automatically adding Mono repository."
-			echo -en ".\r"
-			sleep 1
-			echo -en "..\r"
-			sleep 1
-			echo -en "...\r"
-			sleep 1
-			echo -en "   \r"
-			if [ "${distroid}" == "ubuntu" ]; then
-				if [ "${distroversion}" == "18.04" ]; then
-					cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/ubuntu stable-bionic main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt-get update"
-					eval "${cmd}"
-				elif [ "${distroversion}" == "16.04" ]; then
-					cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;sudo apt-get install apt-transport-https;echo 'deb https://download.mono-project.com/repo/ubuntu stable-xenial main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt-get update"
-					eval "${cmd}"
-				elif [ "${distroversion}" == "14.04" ]; then
-					cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;sudo apt-get install apt-transport-https;echo 'deb https://download.mono-project.com/repo/ubuntu stable-trusty main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt-get update"
-					eval "${cmd}"
-				else
-					fn_print_warn_nl "Installing Mono repository."
-					echo -e "Mono auto install not available for ${distroname}"
-					echo -e "	Follow instructions on mono site to install the latest version of Mono."
-					echo -e "	https://www.mono-project.com/download/stable/#download-lin"
-					monoautoinstall="1"
-				fi
-			elif [ "${distroid}" == "debian" ]; then
-				if [ "${distroversion}" == "10" ]; then
-					cmd="sudo apt-get install apt-transport-https dirmngr;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-buster main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt-get update"
-					eval "${cmd}"
-				elif [ "${distroversion}" == "9" ]; then
-					cmd="sudo apt-get install apt-transport-https dirmngr;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-stretch main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt-get update"
-					eval "${cmd}"
-				elif [ "${distroversion}" == "8" ]; then
-					cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;sudo apt-get install apt-transport-https;echo 'deb https://download.mono-project.com/repo/debian stable-jessie main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt-get update"
-					eval "${cmd}"
-				else
-					echo -e "Mono auto install not available for ${distroname}"
-					echo -e "	Follow instructions on mono site to install the latest version of Mono."
-					echo -e "	https://www.mono-project.com/download/stable/#download-lin"
-					monoautoinstall="1"
-				fi
-			elif [ "${distroid}" == "centos" ]; then
-				if [ "${distroversion}" == "8" ]; then
-					cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF';su -c 'curl https://download.mono-project.com/repo/centos8-stable.repo | tee /etc/yum.repos.d/mono-centos8-stable.repo'"
-					eval "${cmd}"
-				elif [ "${distroversion}" == "7" ]; then
-					cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF';su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'"
-					eval "${cmd}"
-				else
-					echo -e "Mono auto install not available for ${distroname}"
-					echo -e "	Follow instructions on mono site to install the latest version of Mono."
-					echo -e "	https://www.mono-project.com/download/stable/#download-lin"
-					monoautoinstall="1"
-				fi
-			elif [ "${distroid}" == "fedora" ]; then
-				cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF'; su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'; dnf update"
-				eval "${cmd}"
+	if [ "${autodepinstall}" == "0" ]; then
+		fn_print_information_nl "Automatically adding Mono repository."
+		fn_script_log_info "Automatically adding Mono repository."
+		echo -en ".\r"
+		sleep 1
+		echo -en "..\r"
+		sleep 1
+		echo -en "...\r"
+		sleep 1
+		echo -en "   \r"
+		if [ "${distroid}" == "ubuntu" ]; then
+			if [ "${distroversion}" == "20.04" ]; then
+				cmd="sudo apt install gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/ubuntu stable-focal main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
+			elif [ "${distroversion}" == "18.04" ]; then
+				cmd="sudo apt install gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/ubuntu stable-bionic main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
+			elif [ "${distroversion}" == "16.04" ]; then
+				cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;sudo apt install apt-transport-https ca-certificates;echo 'deb https://download.mono-project.com/repo/ubuntu stable-xenial main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
 			else
 			else
-				echo -e "Mono auto install not available for ${distroname}"
-				echo -e "	Follow instructions on mono site to install the latest version of Mono."
-				echo -e "	https://www.mono-project.com/download/stable/#download-lin"
 				monoautoinstall="1"
 				monoautoinstall="1"
 			fi
 			fi
-			if [ "${monoautoinstall}" != "1" ]; then
-				if [ $? != 0 ]; then
-					fn_print_failure_nl "Unable to install Mono repository."
-					fn_script_log_fatal "Unable to installMono repository."
-					monoautoinstall=1
-				else
-					fn_print_complete_nl "Installing Mono repository completed."
-					fn_script_log_pass "Installing Mono repository completed."
-					monoautoinstall=0
-				fi
+		elif [ "${distroid}" == "debian" ]; then
+			if [ "${distroversion}" == "10" ]; then
+				cmd="sudo apt install apt-transport-https dirmngr gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-buster main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
+			elif [ "${distroversion}" == "9" ]; then
+				cmd="sudo apt install apt-transport-https dirmngr gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-stretch main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
+			else
+				monoautoinstall="1"
 			fi
 			fi
-		else
-			fn_print_information_nl "Installing Mono repository."
-			echo -e ""
-			fn_print_warning_nl "$(whoami) does not have sudo access. Manually install Mono repository."
-			fn_script_log_warn "$(whoami) does not have sudo access. Manually install Mono repository."
-			echo -e "* Follow instructions on mono site to install the latest version of Mono."
-			echo -e "	https://www.mono-project.com/download/stable/#download-lin"
-		fi
-	fi
-}
-
-fn_install_universe_repo(){
-	# Defensive coding - As this is an ubuntu only issue then check to make sure this fix is needed, and we are using ubuntu.
-   if [ "${jquniversemissing}" != "0" ]&&[ "${distroid}" == "ubuntu" ]; then
-		fn_print_warning_nl "Ubuntu 18.04.1 contains a bug which means the sources.list file does not populate with the Ubuntu universe repository."
-		fn_print_information_nl "Attempting to add universe repository."
-		if [ "${autoinstall}" == "1" ]; then
-			sudo -n true > /dev/null 2>&1
-		else
-			sudo -v > /dev/null 2>&1
-		fi
-		if [ $? -eq 0 ]; then
-			echo -en ".\r"
-			sleep 1
-			echo -en "..\r"
-			sleep 1
-			echo -en "...\r"
-			sleep 1
-			echo -en "   \r"
-			cmd="sudo apt-add-repository universe"
-			eval "${cmd}"
-			if [ $? -eq 0 ]; then
-				fn_print_complete_nl "Installing universe repository completed."
-				fn_script_log_pass "Installing universe repository completed."
+		elif [ "${distroid}" == "centos" ]||[ "${distroid}" == "almalinux" ]||[ "${distroid}" == "rocky" ]; then
+			if [ "${distroversion}" == "8" ]; then
+				cmd="sudo rpmkeys --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF';su -c 'curl https://download.mono-project.com/repo/centos8-stable.repo | tee /etc/yum.repos.d/mono-centos8-stable.repo'"
+			elif [ "${distroversion}" == "7" ]; then
+				cmd="sudo rpmkeys --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF';su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'"
+			else
+				monoautoinstall="1"
+			fi
+		elif [ "${distroid}" == "fedora" ]; then
+			if [ "${distroversion}" -ge "29" ]; then
+				cmd="sudo rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF';su -c 'curl https://download.mono-project.com/repo/centos8-stable.repo | tee /etc/yum.repos.d/mono-centos8-stable.repo';dnf update"
 			else
 			else
-				fn_print_failure_nl "Unable to install universe repository."
-				fn_script_log_fatal "Unable to install universe repository."
+				cmd="sudo rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF';su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo';dnf update"
 			fi
 			fi
 		else
 		else
-			fn_print_warning_nl "$(whoami) does not have sudo access. Manually add Universe repository."
-			fn_script_log_warn "$(whoami) does not have sudo access. Manually add Universe repository."
-			echo -e "* Please run the following command as a user with sudo access, and re-run the installation"
-			echo -e ""
-			echo -e "	sudo apt-add-repository universe"
+			monoautoinstall="1"
 		fi
 		fi
-	fi
-}
 
 
-fn_deps_detector(){
-	# Checks if dependency is missing.
-if [ "${javacheck}" == "1" ]; then
-		# Added for users using Oracle JRE to bypass check.
-		depstatus=0
-		deptocheck="${javaversion}"
-		unset javacheck
+		# Run the mono repo install.
+		eval "${cmd}"
 
 
-	elif [ "${deptocheck}" == "jq" ]&&[ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "18.04" ]&& ! grep -qE "^deb .*universe" /etc/apt/sources.list; then
-		# #1985 ubuntu 18.04.1 bug does not set sources.list correctly which means universe is not active by default
-		# If the universe repo does not exist, mark as dependency missing and universe missing.
-		depstatus=1
-		jquniversemissing=1
-	elif [ "${deptocheck}" == "mono-complete" ]; then
-		if [ "$(command -v mono 2>/dev/null)" ]&&[ "$(mono --version 2>&1 | grep -Po '(?<=version )\d')" -ge 5 ]; then
-			# Mono >= 5.0.0 already installed.
-			depstatus=0
-		else
-			# Mono not installed or installed Mono < 5.0.0.
-			depstatus=1
-			monostatus=1
-		fi
-	elif [ "$(command -v dpkg-query 2>/dev/null)" ]; then
-		dpkg-query -W -f='${Status}' "${deptocheck}" 2>/dev/null | grep -q -P '^install ok installed'
-		depstatus=$?
-	elif [ "$(command -v rpm 2>/dev/null)" ]; then
-		rpm -q "${deptocheck}" > /dev/null 2>&1
-		depstatus=$?
-	fi
-
-	if [ "${depstatus}" == "0" ]; then
-		# If dependency is found.
-		missingdep=0
-		if [ "${commandname}" == "INSTALL" ]; then
-			echo -e "${green}${deptocheck}${default}"
-			fn_sleep_time
-		fi
-	else
-		# If dependency is not found.
-		missingdep=1
-		if [ "${commandname}" == "INSTALL" ]; then
-			echo -e "${red}${deptocheck}${default}"
-			fn_sleep_time
-		fi
-		# Define required dependencies for SteamCMD.
-		if [ "${appid}" ]; then
-			# lib32gcc1 is now called lib32gcc-s1 in debian 11
-			if { [ "${distroid}" == "debian" ]&&[ "${distroversion}" == "11" ]; }||{ [ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "20.10" ]; } || { [ "${distroid}" == "pop" ]&&[ "${distroversion}" == "20.10" ]; }; then
-				if [ "${deptocheck}" ==  "glibc.i686" ]||[ "${deptocheck}" ==  "libstdc++64.i686" ]||[ "${deptocheck}" ==  "lib32gcc-s1" ]||[ "${deptocheck}" ==  "lib32stdc++6" ]; then
-					steamcmdfail=1
-				fi
+		# Did Mono repo install correctly?
+		if [ "${monoautoinstall}" != "1" ]; then
+			if [ $? != 0 ]; then
+				fn_print_failure_nl "Unable to install Mono repository."
+				fn_script_log_fatal "Unable to install Mono repository."
 			else
 			else
-				if [ "${deptocheck}" ==  "glibc.i686" ]||[ "${deptocheck}" ==  "libstdc++64.i686" ]||[ "${deptocheck}" ==  "lib32gcc1" ]||[ "${deptocheck}" ==  "lib32stdc++6" ]; then
-					steamcmdfail=1
-				fi
+				fn_print_complete_nl "Installing Mono repository completed."
+				fn_script_log_pass "Installing Mono repository completed."
 			fi
 			fi
 		fi
 		fi
-	fi
 
 
-	# Missing dependencies are added to array_deps_missing.
-	if [ "${missingdep}" == "1" ]; then
-		array_deps_missing+=("${deptocheck}")
+		# Mono can not be auto installed with this distro.
+		if [ "${monoautoinstall}" == "1" ]; then
+			fn_print_warning_nl "Mono auto install not available for ${distroname}."
+			echo -e "Follow instructions on Mono website to install."
+			echo -e "https://www.mono-project.com/download/stable/#download-lin"
+			fn_script_log_warn "Unable to install Mono repository. Mono auto install not available for ${distroname}."
+		fi
+
+	else
+		fn_print_information_nl "Installing Mono repository."
+		fn_print_warning_nl "$(whoami) does not have sudo access."
+		echo -e "Follow instructions on Mono website to install."
+		echo -e "https://www.mono-project.com/download/stable/#download-lin"
+		fn_script_log_warn "Unable to install Mono repository. $(whoami) does not have sudo access."
 	fi
 	fi
 }
 }
 
 
@@ -227,25 +108,51 @@ fn_deps_email(){
 	fi
 	fi
 }
 }
 
 
-fn_found_missing_deps(){
+fn_install_missing_deps(){
+	# If any dependencies are not installed.
 	if [ "${#array_deps_missing[*]}" != "0" ]; then
 	if [ "${#array_deps_missing[*]}" != "0" ]; then
-
-		fn_print_warning_nl "Missing dependencies: ${red}${array_deps_missing[*]}${default}"
-		fn_script_log_warn "Missing dependencies: ${array_deps_missing[*]}"
-		fn_sleep_time
-		if [ "${monostatus}" ]; then
-			fn_install_mono_repo
-		fi
-		if [ "${jqstatus}" ]; then
-			fn_print_warning_nl "jq is not available in the ${distroname} repository."
-			echo -e "	* https://docs.linuxgsm.com/requirements/jq"
+		if [ "${commandname}" == "INSTALL" ]; then
+			fn_print_warning_nl "Missing dependencies: ${red}${array_deps_missing[*]}${default}"
+			fn_script_log_warn "Missing dependencies: ${array_deps_missing[*]}"
+		else
+			fn_print_dots "Missing dependencies"
+			fn_print_warn "Missing dependencies: ${red}${array_deps_missing[*]}${default}"
+			fn_script_log_warn "Missing dependencies: ${array_deps_missing[*]}"
 		fi
 		fi
+		fn_sleep_time
+
+		# Attempt automatic dependency installation
 		if [ "${autoinstall}" == "1" ]; then
 		if [ "${autoinstall}" == "1" ]; then
 			sudo -n true > /dev/null 2>&1
 			sudo -n true > /dev/null 2>&1
 		else
 		else
 			sudo -v > /dev/null 2>&1
 			sudo -v > /dev/null 2>&1
 		fi
 		fi
-		if [ $? -eq 0 ]; then
+		autodepinstall="$?"
+
+		if [ "${monostatus}" == "1" ]; then
+			fn_install_mono_repo
+		fi
+
+		if [ "${commandname}" == "INSTALL" ]; then
+			if [ "${autodepinstall}" == "0" ]; then
+				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."
+			fi
+		fi
+
+
+		# Add sudo dpkg --add-architecture i386 if using i386 packages.
+		if [ "$(command -v dpkg-query 2>/dev/null)" ]; then
+			if printf '%s\n' "${array_deps_required[@]}" | grep -q -P 'i386'; then
+				i386installcommand="sudo dpkg --add-architecture i386; "
+			fi
+		fi
+
+		# If automatic dependency install is available
+		if [ "${autodepinstall}" == "0" ]; then
 			fn_print_information_nl "Automatically installing missing dependencies."
 			fn_print_information_nl "Automatically installing missing dependencies."
 			fn_script_log_info "Automatically installing missing dependencies."
 			fn_script_log_info "Automatically installing missing dependencies."
 			echo -en ".\r"
 			echo -en ".\r"
@@ -256,7 +163,7 @@ fn_found_missing_deps(){
 			sleep 1
 			sleep 1
 			echo -en "   \r"
 			echo -en "   \r"
 			if [ "$(command -v dpkg-query 2>/dev/null)" ]; then
 			if [ "$(command -v dpkg-query 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; sudo dpkg --add-architecture i386; sudo apt-get update; sudo apt-get -y install ${array_deps_missing[*]}"
+				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[*]}"
 				eval "${cmd}"
 				eval "${cmd}"
 			elif [ "$(command -v dnf 2>/dev/null)" ]; then
 			elif [ "$(command -v dnf 2>/dev/null)" ]; then
 				cmd="sudo dnf -y install ${array_deps_missing[*]}"
 				cmd="sudo dnf -y install ${array_deps_missing[*]}"
@@ -265,61 +172,36 @@ fn_found_missing_deps(){
 				cmd="sudo yum -y install ${array_deps_missing[*]}"
 				cmd="sudo yum -y install ${array_deps_missing[*]}"
 				eval "${cmd}"
 				eval "${cmd}"
 			fi
 			fi
-			if [ $? != 0 ]; then
-				fn_print_failure_nl "Unable to install dependencies."
-				fn_script_log_fatal "Unable to install dependencies."
-				echo -e ""
-				fn_print_warning_nl "Manually install dependencies."
-				fn_script_log_warn "Manually install dependencies."
-				if [ "$(command -v dpkg-query 2>/dev/null)" ]; then
-					echo -e "	sudo dpkg --add-architecture i386; sudo apt update; sudo apt install ${array_deps_missing[*]}"
-				elif [ "$(command -v dnf 2>/dev/null)" ]; then
-					echo -e "	sudo dnf install ${array_deps_missing[*]}"
-				elif [ "$(command -v yum 2>/dev/null)" ]; then
-					echo -e "	sudo yum install ${array_deps_missing[*]}"
-				fi
-				if [ "${steamcmdfail}" ]; then
-					echo -e ""
-					if [ "${commandname}" == "INSTALL" ]; then
-						fn_print_failure_nl "Missing dependencies required to run SteamCMD."
-						fn_script_log_fatal "Missing dependencies required to run SteamCMD."
-						core_exit.sh
-					else
-						fn_print_error_nl "Missing dependencies required to run SteamCMD."
-						fn_script_log_error "Missing dependencies required to run SteamCMD."
-					fi
-				fi
-			else
-				fn_print_complete_nl "Install dependencies completed."
-				fn_script_log_pass "Install dependencies completed."
+			autodepinstall="$?"
+
+			# If auto install passes remove steamcmd install failure.
+			if [ "${autodepinstall}" == "0" ]; then
+				unset steamcmdfail
 			fi
 			fi
-		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."
-			echo -e ""
+		fi
+
+		# If automatic dependency install is unavailable.
+		if [ "${autodepinstall}" != "0" ]; then
 			if [ "$(command -v dpkg-query 2>/dev/null)" ]; then
 			if [ "$(command -v dpkg-query 2>/dev/null)" ]; then
-				echo -e "sudo dpkg --add-architecture i386; sudo apt update; sudo apt install ${array_deps_missing[*]}"
+				echo -e "${i386installcommand}sudo apt update; sudo apt install ${array_deps_missing[*]}"
 			elif [ "$(command -v dnf 2>/dev/null)" ]; then
 			elif [ "$(command -v dnf 2>/dev/null)" ]; then
 				echo -e "sudo dnf install ${array_deps_missing[*]}"
 				echo -e "sudo dnf install ${array_deps_missing[*]}"
 			elif [ "$(command -v yum 2>/dev/null)" ]; then
 			elif [ "$(command -v yum 2>/dev/null)" ]; then
 				echo -e "sudo yum install ${array_deps_missing[*]}"
 				echo -e "sudo yum install ${array_deps_missing[*]}"
 			fi
 			fi
-			if [ "${steamcmdfail}" ]; then
-				echo -e ""
-				if [ "${commandname}" == "INSTALL" ]; then
-					fn_print_failure_nl "Missing dependencies required to run SteamCMD."
-					fn_script_log_fatal "Missing dependencies required to run SteamCMD."
-					core_exit.sh
-				else
-					fn_print_error_nl "Missing dependencies required to run SteamCMD."
-					fn_script_log_error "Missing dependencies required to run SteamCMD."
-				fi
-			fi
-			echo -e ""
 		fi
 		fi
-		if [ "${commandname}" == "INSTALL" ]; then
-			sleep 5
+
+		if [ "${steamcmdfail}" ]; then
+			if [ "${commandname}" == "INSTALL" ]; then
+				fn_print_failure_nl "Missing dependencies required to run SteamCMD."
+				fn_script_log_fatal "Missing dependencies required to run SteamCMD."
+				core_exit.sh
+			else
+				fn_print_error_nl "Missing dependencies required to run SteamCMD."
+				fn_script_log_error "Missing dependencies required to run SteamCMD."
+			fi
 		fi
 		fi
+
 	else
 	else
 		if [ "${commandname}" == "INSTALL" ]; then
 		if [ "${commandname}" == "INSTALL" ]; then
 			fn_print_information_nl "Required dependencies already installed."
 			fn_print_information_nl "Required dependencies already installed."
@@ -329,266 +211,88 @@ fn_found_missing_deps(){
 }
 }
 
 
 fn_check_loop(){
 fn_check_loop(){
-	# Loop though required depenencies.
+	# Loop though required depenencies checking if they are installed.
 	for deptocheck in ${array_deps_required[*]}; do
 	for deptocheck in ${array_deps_required[*]}; do
 		fn_deps_detector
 		fn_deps_detector
 	done
 	done
 
 
-	# user to be informed of any missing dependencies.
-	fn_found_missing_deps
+	# user will be informed of any missing dependencies.
+	fn_install_missing_deps
 }
 }
 
 
-# Generate require dependencies for debian based systems.
-fn_deps_build_debian(){
-	# Generate array of missing deps.
-	array_deps_missing=()
-
-	# LinuxGSM requirements.
-	array_deps_required=( curl wget ca-certificates file bsdmainutils util-linux python3 tar bzip2 gzip unzip binutils bc jq tmux netcat cpio )
-
-	# All servers except ts3, mumble, GTA and minecraft servers require lib32stdc++6 and lib32gcc1.
-	if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "mumble" ]&&[ "${shortname}" != "mc" ]&&[ "${shortname}" != "pmc" ]&&[ "${shortname}" != "wmc" ]&&[ "${engine}" != "renderware" ]; then
-		if [ "${arch}" == "x86_64" ]; then
-			# lib32gcc1 is now called lib32gcc-s1 in debian 11
-			if { [ "${distroid}" == "debian" ]&&[ "${distroversion}" == "11" ]; }||{ [ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "20.10" ]; }||{ [ "${distroid}" == "pop" ]&&[ "${distroversion}" == "20.10" ]; }; then
-				array_deps_required+=( lib32gcc-s1 lib32stdc++6 )
-			else
-				array_deps_required+=( lib32gcc1 lib32stdc++6 )
-			fi
-		else
-			array_deps_required+=( lib32stdc++6 )
-		fi
-	fi
-	# If requires steamcmd.
-	if [ "${appid}" ]; then
-		# Will not use apt if non-free repo is missing or Ubuntu 14.04
-		if [ "${distroversion}" == "14.04" ]||[ "${distroid}" == "debian" ]&& ! grep -qE "^deb .*non-free" /etc/apt/sources.list; then
-			:
-		else
-			array_deps_required+=( steamcmd libsdl2-2.0-0:i386 )
-		fi
-	fi
-
-	# Game Specific requirements.
-
-	# Natural Selection 2 (x64 only)
-	if [ "${shortname}" == "ns2" ]; then
-		array_deps_required+=( speex libtbb2 )
-	# NS2: Combat
-	elif [ "${shortname}" == "ns2c" ]; then
-		array_deps_required+=( speex:i386 libtbb2 )
-	# 7 Days to Die
-	elif [ "${shortname}" == "sdtd" ]; then
-		array_deps_required+=( telnet expect )
-	# Battlefield: Vietnam
-	elif [ "${shortname}" == "bfv" ]; then
-		array_deps_required+=( libncurses5:i386 libstdc++5:i386 )
-	# Battlefield 1942
-	elif [ "${shortname}" == "bf1942" ]; then
-		array_deps_required+=( libncurses5:i386 libtinfo5:i386 )
-	# Black Mesa: Death Match
-	elif [ "${shortname}" == "bmdm" ]; then
-		array_deps_required+=( libncurses5:i386 )
-	# Counter-Strike: Source, Garry's Mod, No More Room in Hell, Source Forts Classic, Zombie Master Reborn and Zombie Panic: Source
-	elif [ "${shortname}" == "css" ]||[ "${shortname}" == "gmod" ]||[ "${shortname}" == "nmrih" ]||[ "${shortname}" == "sfc" ]||[ "${shortname}" == "zmr" ]||[ "${shortname}" == "zps" ]; then
-		if [ "${arch}" == "x86_64" ]; then
-			array_deps_required+=( libtinfo5:i386 )
-		else
-			array_deps_required+=( libtinfo5 )
-		fi
-	# Brainbread 2, Don't Starve Together & Team Fortress 2
-	elif [ "${shortname}" == "bb2" ]||[ "${shortname}" == "dst" ]||[ "${shortname}" == "tf2" ]; then
-		array_deps_required+=( libcurl4-gnutls-dev:i386 )
-	# Call of Duty & Medal of Honor: Allied Assault
-	elif [ "${shortname}" == "cod" ]||[ "${shortname}" == "coduo" ]||[ "${shortname}" == "cod2" ]||[ "${shortname}" == "mohaa" ]; then
-		array_deps_required+=( libstdc++5:i386 )
-	# Barotrauma
-	elif [ "${shortname}" == "bt" ]; then
-		array_deps_required+=( libicu-dev )
-	# Ecoserver
-	elif [ "${shortname}" == "eco" ]; then
-		array_deps_required+=( libgdiplus )
-	# Factorio
-	elif [ "${shortname}" == "fctr" ]; then
-		array_deps_required+=( xz-utils )
-	# Hurtword/Rust
-	elif [ "${shortname}" == "hw" ]||[ "${shortname}" == "rust" ]; then
-		array_deps_required+=( lib32z1 )
-	# Minecraft, Rising World
-	elif [ "${shortname}" == "mc" ]||[ "${shortname}" == "pmc" ]||[ "${shortname}" == "wmc" ]; then
-		javaversion=$(java -version 2>&1 | grep "version")
-		if [ "${javaversion}" ]; then
-			# Added for users using Oracle JRE to bypass the check.
-			javacheck=1
-		else
-			if { [ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "20.04" ]; }||{ [ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "20.10" ]; }||{ [ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "21.04" ]; }||{ [ "${distroid}" == "pop" ]&&[ "${distroversion}" == "20.04" ]; }||{ [ "${distroid}" == "pop" ]&&[ "${distroversion}" == "20.10" ]; }||{ [ "${distroid}" == "pop" ]&&[ "${distroversion}" == "21.04" ]; }; then
-				array_deps_required+=( openjdk-16-jre )
-			else
-				array_deps_required+=( default-jre )
-			fi
-		fi
-	elif [ "${shortname}" == "rw" ]; then
-		javaversion=$(java -version 2>&1 | grep "version")
-		if [ "${javaversion}" ]; then
-			# Added for users using Oracle JRE to bypass the check.
-			javacheck=1
+# Checks if dependency is installed or not.
+fn_deps_detector(){
+	## Check.
+	# SteamCMD: Will be removed from required array if no appid is present or non-free repo is not available.
+	# This will cause SteamCMD to be installed using tar.
+	if [ -z "${appid}" ]||[ "${deptocheck}" == "steamcmd" ]&&[ "${distroid}" == "debian" ]&& ! grep -qE "^deb .*non-free" /etc/apt/sources.list; then
+		array_deps_required=( "${array_deps_required[@]/steamcmd}" )
+		steamcmdstatus=1
+	# Java: Added for users using Oracle JRE to bypass check.
+	elif [[ ${deptocheck} == "openjdk"* ]]||[[ ${deptocheck} == "java"* ]]; then
+		# Is java already installed?
+		if [ -n "${javaversion}" ]; then
+			# Added for users using Oracle JRE to bypass check.
+			depstatus=0
+			deptocheck="${javaversion}"
 		else
 		else
-			array_deps_required+=( default-jre )
+			depstatus=1
 		fi
 		fi
-	# Onset
-	elif [ "${shortname}" == "onset" ]; then
-		array_deps_required+=( libmariadbclient-dev )
-	# Project Zomboid
-	elif [ "${shortname}" == "pz" ]; then
-		if java -version 2>&1 | grep "version"; then
-			# Added for users using Oracle JRE to bypass the check.
-			javacheck=1
-			array_deps_required+=( rng-tools )
+	# Mono: A Mono repo needs to be installed.
+	elif [ "${deptocheck}" == "mono-complete" ]; then
+		if [ -n "${monoversion}" ]&&[ "${monoversion}" -ge "5" ]; then
+			# Mono >= 5.0.0 already installed.
+			depstatus=0
+			monostatus=0
 		else
 		else
-			array_deps_required+=( default-jre rng-tools )
-		fi
-	# SCP: Secret Laboratory, SCP: Secret Laboratory ServerMod
-	elif [ "${shortname}" == "scpsl" ]||[ "${shortname}" == "scpslsm" ]; then
-		array_deps_required+=( mono-complete )
-	# Sven Co-op
-	elif [ "${shortname}" == "sven" ]; then
-		array_deps_required+=( libssl1.1:i386 zlib1g:i386 )
-	# Vintage Story
-	elif [ "${shortname}" == "vints" ]; then
-		array_deps_required+=( mono-complete )
-	# Wurm: Unlimited
-	elif [ "${shortname}" == "wurm" ]; then
-		array_deps_required+=( xvfb )
-	# Post Scriptum
-	elif [ "${shortname}" == "pstbs" ]; then
-		array_deps_required+=( libgconf-2-4 )
-	# Pavlov VR
-	elif [ "${shortname}" == "pvr" ]; then
-		array_deps_required+=( libc++1 )
-	fi
-
-	# check if system is a lxc container and the hostname dependency.
-	if command -v systemd-detect-virt &> /dev/null; then
-		systemd_virt=$(systemd-detect-virt)
-		if [ "${systemd_virt}" == "lxc" ]||[ "${systemd_virt}" == "lxc-libvirt" ]; then
-			array_deps_required+=( hostname )
+			# Mono not installed or installed Mono < 5.0.0.
+			depstatus=1
+			monostatus=1
 		fi
 		fi
+	elif [ "$(command -v dpkg-query 2>/dev/null)" ]; then
+		dpkg-query -W -f='${Status}' "${deptocheck}" 2>/dev/null | grep -q -P '^install ok installed'
+		depstatus=$?
+	elif [ "$(command -v dnf 2>/dev/null)" ]; then
+		dnf list installed "${deptocheck}" > /dev/null 2>&1
+		depstatus=$?
+	elif [ "$(command -v rpm 2>/dev/null)" ]; then
+		rpm -q "${deptocheck}" > /dev/null 2>&1
+		depstatus=$?
 	fi
 	fi
 
 
-	fn_deps_email
-	fn_check_loop
-}
-
-fn_deps_build_redhat(){
-	# Generate array of missing deps.
-	array_deps_missing=()
-
-	# LinuxGSM requirements.
-	# CentOS
-  if [ "${distroversion}" == "7" ]; then
-		array_deps_required=( epel-release curl wget util-linux python3 file tar gzip bzip2 unzip binutils bc jq tmux nmap-ncat cpio )
-	elif [ "${distroversion}" == "8" ]; then
-		array_deps_required=( epel-release curl wget util-linux python36 file tar gzip bzip2 unzip binutils bc jq tmux nmap-ncat cpio )
-	elif [ "${distroid}" == "fedora" ]; then
-		array_deps_required=( curl wget util-linux python3 file tar gzip bzip2 unzip binutils bc jq tmux nmap-ncat cpio )
-	elif [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then
-		array_deps_required=( curl wget util-linux python3 file tar gzip bzip2 unzip binutils bc jq tmux nmap-ncat cpio )
-	else
-		array_deps_required=( curl wget util-linux python3 file tar gzip bzip2 unzip binutils bc jq tmux nmap-ncat cpio )
-	fi
-
-	# All servers except ts3, mumble, multi theft auto and minecraft servers require glibc.i686 and libstdc++.i686.
-	if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "mumble" ]&&[ "${shortname}" != "mc" ]&&[ "${engine}" != "renderware" ]; then
-		if [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then
-			array_deps_required+=( glibc.i686 libstdc++64.i686 )
-		else
-			array_deps_required+=( glibc.i686 libstdc++.i686 )
+	# Outcome of Check.
+	if [ "${steamcmdstatus}" == "1" ]; then
+		# If SteamCMD is not available in repo dont check for it.
+		unset steamcmdstatus
+	elif [ "${depstatus}" == "0" ]; then
+		# If dependency is found.
+		missingdep=0
+		if [ "${commandname}" == "INSTALL" ]; then
+			echo -e "${green}${deptocheck}${default}"
+			sleep 0.1
 		fi
 		fi
-	fi
-
-	# Game Specific requirements.
-
-	# Natural Selection 2 (x64 only)
-	if [ "${shortname}" == "ns2" ]; then
-		array_deps_required+=( speex tbb )
-	# NS2: Combat
-	elif [ "${shortname}" == "ns2c" ]; then
-		array_deps_required+=( speex.i686 tbb.i686 )
-	# 7 Days to Die
-	elif [ "${shortname}" == "sdtd" ]; then
-		array_deps_required+=( telnet expect )
-	# Barotrauma
-	elif [ "${shortname}" == "bt" ]; then
-		array_deps_required+=( libicu )
-	# Battlefield: Vietnam
-	elif [ "${shortname}" == "bfv" ]; then
-		array_deps_required+=( compat-libstdc++-33.i686 glibc.i686 )
-	# Battlefield 1942, Black Mesa: Deathmatch, Counter-Strike: Source, Garry's Mod, No More Room in Hell, Source Forts Classic, Zombie Master Reborn and Zombie Panic: Source
-	elif [ "${shortname}" == "bf1942" ]||[ "${shortname}" == "bmdm" ]||[ "${shortname}" == "css" ]||[ "${shortname}" == "gmod" ]||[ "${shortname}" == "nmrih" ]||[ "${shortname}" == "sfc" ]||[ "${shortname}" == "zmr" ]||[ "${shortname}" == "zps" ]; then
-		array_deps_required+=( ncurses-libs.i686 )
-	# Brainbread 2, Don't Starve Together & Team Fortress 2
-	elif [ "${shortname}" == "bb2" ]||[ "${shortname}" == "dst" ]||[ "${shortname}" == "tf2" ]; then
-		array_deps_required+=( libcurl.i686 )
-	# Call of Duty & Medal of Honor: Allied Assault
-	elif [ "${shortname}" == "cod" ]||[ "${shortname}" == "coduo" ]||[ "${shortname}" == "cod2" ]||[ "${shortname}" == "mohaa" ]; then
-		array_deps_required+=( compat-libstdc++-33.i686 )
-	# Ecoserver
-	elif [ "${shortname}" == "eco" ]; then
-		array_deps_required+=( libgdiplus )
-	# Factorio
-	elif [ "${shortname}" == "fctr" ]; then
-		array_deps_required+=( xz )
-	# Hurtword/Rust
-	elif [ "${shortname}" == "hw" ]||[ "${shortname}" == "rust" ]; then
-		array_deps_required+=( zlib-devel )
-	# Minecraft, Rising World, Wurm
-	elif [ "${shortname}" == "mc" ]||[ "${shortname}" == "pmc" ]||[ "${shortname}" == "wmc" ]||[ "${shortname}" == "rw" ]; then
-		javaversion=$(java -version 2>&1 | grep "version")
-		if [ "${javaversion}" ]; then
-			# Added for users using Oracle JRE to bypass the check.
-			javacheck=1
-		else
-			array_deps_required+=( java-11-openjdk )
+	elif [ "${depstatus}" != "0" ]; then
+		# If dependency is not found.
+		missingdep=1
+		if [ "${commandname}" == "INSTALL" ]; then
+			echo -e "${red}${deptocheck}${default}"
+			sleep 0.1
 		fi
 		fi
-	# Onset
-	elif [ "${shortname}" == "onset" ]; then
-		array_deps_required+=( mariadb-connector-c )
-	# Project Zomboid
-	elif [ "${shortname}" == "pz" ]; then
-		if java -version 2>&1 | grep "version"; then
-			# Added for users using Oracle JRE to bypass the check.
-			javacheck=1
-			array_deps_required+=( rng-tools )
-		else
-			array_deps_required+=( java-11-openjdk rng-tools )
+		# If SteamCMD requirements are not met install will fail.
+		if [ -n "${appid}" ]; then
+				for steamcmddeptocheck in ${array_deps_required_steamcmd[*]}; do
+					if [ "${deptocheck}" != "steamcmd" ]&&[ "${deptocheck}" == "${steamcmddeptocheck}" ]; then
+						steamcmdfail=1
+					fi
+				done
 		fi
 		fi
-	# Sven Co-op
-	elif [ "${shortname}" == "sven" ]; then
-		: # not compatible
-	# Vintage Story
-	elif [ "${shortname}" == "vints" ]; then
-		array_deps_required+=( mono-complete )
-	# Wurm: Unlimited
-	elif [ "${shortname}" == "wurm" ]; then
-		array_deps_required+=( xorg-x11-server-Xvfb )
-	# Post Scriptum
-	elif [ "${shortname}" == "pstbs" ]; then
-		array_deps_required+=( GConf2 )
-	# Pavlov VR
-	elif [ "${shortname}" == "pvr" ]; then
-		array_deps_required+=( libcxx )
 	fi
 	fi
+	unset depstatus
 
 
-	# check if system is a lxc container and the hostname dependency.
-	if command -v systemd-detect-virt &> /dev/null; then
-		systemd_virt=$(systemd-detect-virt)
-		if [ "${systemd_virt}" == "lxc" ]||[ "${systemd_virt}" == "lxc-libvirt" ]; then
-			array_deps_required+=( hostname )
-		fi
+	# Missing dependencies are added to array_deps_missing.
+	if [ "${missingdep}" == "1" ]; then
+		array_deps_missing+=("${deptocheck}")
 	fi
 	fi
-
-	fn_deps_email
-	fn_check_loop
 }
 }
 
 
 if [ "${commandname}" == "INSTALL" ]; then
 if [ "${commandname}" == "INSTALL" ]; then
@@ -606,12 +310,41 @@ if [ "${commandname}" == "INSTALL" ]; then
 	fi
 	fi
 fi
 fi
 
 
-# Filter checking in to Debian or Red Hat Based.
 info_distro.sh
 info_distro.sh
-if [ -f "/etc/debian_version" ]; then
-	fn_deps_build_debian
-elif [ -f "/etc/redhat-release" ]; then
-	fn_deps_build_redhat
-else
-	fn_print_warning_nl "${distroname} dependency checking unavailable."
+
+if [ ! -f "${tmpdir}/dependency-no-check.tmp" ]&&[ ! -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then
+	# Check that the distro dependency csv file exists.
+	fn_check_file_github "lgsm/data" "${distroid}-${distroversioncsv}.csv"
+	if [ -n "${checkflag}" ]&&[ "${checkflag}" == "0" ]; then
+		fn_fetch_file_github "lgsm/data" "${distroid}-${distroversioncsv}.csv" "lgsm/data" "chmodx" "norun" "noforce" "nohash"
+	fi
+fi
+
+# If the file successfully downloaded run the dependency check.
+if [ -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then
+	depall=$(awk -F, '$1=="all" {$1=""; print $0}' "${datadir}/${distroid}-${distroversioncsv}.csv")
+	depsteamcmd=$(awk -F, '$1=="steamcmd" {$1=""; print $0}' "${datadir}/${distroid}-${distroversioncsv}.csv")
+	depshortname=$(awk -v shortname="$shortname" -F, '$1==shortname {$1=""; print $0}'  "${datadir}/${distroid}-${distroversioncsv}.csv")
+
+	# Generate array of missing deps.
+	array_deps_missing=()
+
+	array_deps_required=("${depall} ${depsteamcmd} ${depshortname}")
+	array_deps_required_steamcmd=("${depsteamcmd}")
+	fn_deps_email
+	# Unique sort dependency array.
+	IFS=" " read -r -a array_deps_required <<< "$(echo "${array_deps_required[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
+
+	fn_check_loop
+# Warn the user that dependency checking is unavailable for their distro.
+elif [ "${commandname}" == "INSTALL" ]||[ -n "${checkflag}" ]&&[ "${checkflag}" != "0" ]; then
+	fn_print_warning_nl "LinuxGSM dependency checking currently unavailable for ${distroname}."
+	# Prevent future dependency checking if unavailable for the distro.
+	echo "${version}" > "${tmpdir}/dependency-no-check.tmp"
+elif 	[ -f "${tmpdir}/dependency-no-check.tmp" ]; then
+	# Allow LinuxGSM to try a dependency check if LinuxGSM has been recently updated.
+	nocheckversion=$(cat "${tmpdir}/dependency-no-check.tmp")
+	if [ "${version}" != "${nocheckversion}" ]; then
+		rm -f "${tmpdir:?}/dependency-no-check.tmp"
+	fi
 fi
 fi

+ 16 - 5
lgsm/functions/check_ip.sh

@@ -10,11 +10,22 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 
 info_game.sh
 info_game.sh
 
 
-if [ ! -f "/bin/ip" ]; then
-	ipcommand="/sbin/ip"
-else
-	ipcommand="ip"
-fi
+ip_commands_array=( "/bin/ip" "/usr/sbin/ip" "ip")
+for ip_command in "${ip_commands_array[@]}"; do
+	if [ "$(command -v ${ip_command} 2>/dev/null)" ]; then
+		ipcommand="${ip_command}"
+		break
+	fi
+done
+
+ethtool_commands_array=( "/bin/ethtool" "/usr/sbin/ethtool" "ethtool")
+for ethtool_command in "${ethtool_commands_array[@]}"; do
+	if [ "$(command -v ${ethtool_command} 2>/dev/null)" ]; then
+		ethtoolcommand="${ethtool_command}"
+		break
+	fi
+done
+
 getip=$(${ipcommand} -o -4 addr | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | sort -u | grep -v 127.0.0)
 getip=$(${ipcommand} -o -4 addr | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | sort -u | grep -v 127.0.0)
 getipwc=$(${ipcommand} -o -4 addr | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | sort -u | grep -vc 127.0.0)
 getipwc=$(${ipcommand} -o -4 addr | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | sort -u | grep -vc 127.0.0)
 
 

+ 3 - 8
lgsm/functions/command_debug.sh

@@ -112,17 +112,12 @@ fi
 
 
 # Note: do not add double quotes to ${executable} ${startparameters}.
 # Note: do not add double quotes to ${executable} ${startparameters}.
 if [ "${engine}" == "source" ]||[ "${engine}" == "goldsrc" ]; then
 if [ "${engine}" == "source" ]||[ "${engine}" == "goldsrc" ]; then
-	${executable} ${startparameters} -debug
-elif [ "${shortname}" == "arma3" ]; then
-	# Arma3 requires semicolons in the module list, which need to
-	# be escaped for regular (tmux) loading, but need to be
-	# stripped when loading straight from the console.
-	${executable} ${parms//\\;/;}
+	eval "${executable} ${startparameters} -debug"
 elif [ "${engine}" == "quake" ]; then
 elif [ "${engine}" == "quake" ]; then
-	${executable} ${startparameters} -condebug
+	eval "${executable} ${startparameters} -condebug"
 else
 else
 	# shellcheck disable=SC2086
 	# shellcheck disable=SC2086
-	${preexecutable} ${executable} ${startparameters}
+	eval "${preexecutable} ${executable} ${startparameters}"
 fi
 fi
 
 
 fn_lockfile_trap
 fn_lockfile_trap

+ 33 - 0
lgsm/functions/command_update_linuxgsm.sh

@@ -11,6 +11,7 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 fn_firstcommand_set
 fn_firstcommand_set
 
 
 check.sh
 check.sh
+info_distro.sh
 
 
 fn_print_dots ""
 fn_print_dots ""
 fn_script_log_info "Updating LinuxGSM"
 fn_script_log_info "Updating LinuxGSM"
@@ -146,6 +147,38 @@ else
 	fn_script_log_pass "Checking ${remotereponame} config _default.cfg"
 	fn_script_log_pass "Checking ${remotereponame} config _default.cfg"
 fi
 fi
 
 
+# Check distro csv. ${datadir}/${distroid}-${distroversioncsv}.csv
+if [ -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then
+	echo -en "checking ${remotereponame} config ${distroid}-${distroversioncsv}.csv...\c"
+	fn_script_log_info "Checking ${remotereponame} ${distroid}-${distroversioncsv}.csv"
+	if [ "${remotereponame}" == "GitHub" ]; then
+		curl --connect-timeout 10 -IsfL "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/${distroid}-${distroversioncsv}.csv" 1>/dev/null
+	else
+		curl --connect-timeout 10 -IsfL "https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/lgsm/data/${distroid}-${distroversioncsv}.csv" 1>/dev/null
+	fi
+	if [ $? != "0" ]; then
+		fn_print_fail_eol_nl
+		fn_script_log_fatal "Checking ${remotereponame} ${distroid}-${distroversioncsv}.csv"
+		fn_script_log_fatal "Curl returned error: $?"
+		core_exit.sh
+	fi
+
+	if [ "${remotereponame}" == "GitHub" ]; then
+		config_file_diff=$(diff "${datadir}/${distroid}-${distroversioncsv}.csv" <(curl --connect-timeout 10 -s "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/${distroid}-${distroversioncsv}.csv"))
+	else
+		config_file_diff=$(diff "${datadir}/${distroid}-${distroversioncsv}.csv" <(curl --connect-timeout 10 -s "https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/lgsm/data/${distroid}-${distroversioncsv}.csv"))
+	fi
+
+	if [ "${config_file_diff}" != "" ]; then
+		fn_print_update_eol_nl
+		fn_script_log_update "Checking ${remotereponame} ${distroid}-${distroversioncsv}.csv"
+		rm -f "${datadir:?}/${distroid}-${distroversioncsv}.csv"
+		fn_fetch_file_github "lgsm/data" "${distroid}-${distroversioncsv}.csv" "${datadir}" "nochmodx" "norun" "noforce" "nohash"
+	else
+		fn_print_ok_eol_nl
+		fn_script_log_pass "Checking ${remotereponame} ${distroid}-${distroversioncsv}.csv"
+	fi
+fi
 # Check and update modules.
 # Check and update modules.
 if [ -n "${functionsdir}" ]; then
 if [ -n "${functionsdir}" ]; then
 	if [ -d "${functionsdir}" ]; then
 	if [ -d "${functionsdir}" ]; then

+ 115 - 31
lgsm/functions/core_dl.sh

@@ -252,6 +252,75 @@ fn_fetch_trap(){
 	core_exit.sh
 	core_exit.sh
 }
 }
 
 
+# Will check a file exists and download it. Will not exit if fails to download.
+fn_check_file(){
+	remote_fileurl="${1}"
+	remote_fileurl_backup="${2}"
+	remote_fileurl_name="${3}"
+	remote_fileurl_backup_name="${4}"
+	remote_filename="${5}"
+	# 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))
+		echo -en "checking ${fileurl_name} ${remote_filename}...\c"
+		curlcmd=$(curl --output /dev/null --silent --head --fail "${fileurl}" 2>&1)
+		local exitcode=$?
+
+		# On first try will error. On second try will fail.
+		if [ "${exitcode}" != 0 ]; then
+			if [ ${counter} -ge 2 ]; then
+				fn_print_fail_eol_nl
+				if [ -f "${lgsmlog}" ]; then
+					fn_script_log_fatal "Checking ${remote_filename}"
+					fn_script_log_fatal "${fileurl}"
+					checkflag=1
+				fi
+			else
+				fn_print_error_eol_nl
+				if [ -f "${lgsmlog}" ]; then
+					fn_script_log_error "Checking ${remote_filename}"
+					fn_script_log_error "${fileurl}"
+					checkflag=2
+				fi
+			fi
+		else
+			fn_print_ok_eol
+			sleep 0.3
+			echo -en "\033[2K\\r"
+			if [ -f "${lgsmlog}" ]; then
+				fn_script_log_pass "Checking ${remote_filename}"
+				checkflag=0
+			fi
+			break
+		fi
+	done
+
+	if [ -f "${local_filedir}/${local_filename}" ]; then
+		fn_dl_hash
+		# Execute file if run is set.
+		if [ "${run}" == "run" ]; then
+			# shellcheck source=/dev/null
+			source "${local_filedir}/${local_filename}"
+		fi
+	fi
+}
+
 fn_fetch_file(){
 fn_fetch_file(){
 	remote_fileurl="${1}"
 	remote_fileurl="${1}"
 	remote_fileurl_backup="${2}"
 	remote_fileurl_backup="${2}"
@@ -361,8 +430,8 @@ fn_fetch_file(){
 # GitHub file download functions.
 # GitHub file download functions.
 # Used to simplify downloading specific files from GitHub.
 # Used to simplify downloading specific files from GitHub.
 
 
-# github_file_url_dir: the directory of the file in the GitHub: lgsm/functions
-# github_file_url_name: the filename of the file to download from GitHub: core_messages.sh
+# github_fileurl_dir: the directory of the file in the GitHub: lgsm/functions
+# github_fileurl_name: the filename of the file to download from GitHub: core_messages.sh
 # githuburl: the full GitHub url
 # githuburl: the full GitHub url
 
 
 # remote_fileurl: The URL of the file: http://example.com/dl/File.tar.bz2
 # remote_fileurl: The URL of the file: http://example.com/dl/File.tar.bz2
@@ -375,24 +444,24 @@ fn_fetch_file(){
 
 
 # Fetches files from the Git repo.
 # Fetches files from the Git repo.
 fn_fetch_file_github(){
 fn_fetch_file_github(){
-	github_file_url_dir="${1}"
-	github_file_url_name="${2}"
+	github_fileurl_dir="${1}"
+	github_fileurl_name="${2}"
 	# For legacy versions - code can be removed at a future date
 	# For legacy versions - code can be removed at a future date
 	if [ "${legacymode}" == "1" ]; then
 	if [ "${legacymode}" == "1" ]; then
-		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${github_file_url_name}"
-		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/${github_file_url_dir}/${github_file_url_name}"
+		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_fileurl_dir}/${github_fileurl_name}"
+		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/${github_fileurl_dir}/${github_fileurl_name}"
 	# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
 	# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
 	elif [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
 	elif [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
-		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}"
-		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
+		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_fileurl_dir}/${github_fileurl_name}"
+		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_fileurl_dir}/${github_fileurl_name}"
 	else
 	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}"
+		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_fileurl_dir}/${github_fileurl_name}"
+		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/${github_fileurl_dir}/${github_fileurl_name}"
 	fi
 	fi
 	remote_fileurl_name="GitHub"
 	remote_fileurl_name="GitHub"
 	remote_fileurl_backup_name="Bitbucket"
 	remote_fileurl_backup_name="Bitbucket"
 	local_filedir="${3}"
 	local_filedir="${3}"
-	local_filename="${github_file_url_name}"
+	local_filename="${github_fileurl_name}"
 	chmodx="${4:-0}"
 	chmodx="${4:-0}"
 	run="${5:-0}"
 	run="${5:-0}"
 	forcedl="${6:-0}"
 	forcedl="${6:-0}"
@@ -401,17 +470,32 @@ fn_fetch_file_github(){
 	fn_fetch_file "${remote_fileurl}" "${remote_fileurl_backup}" "${remote_fileurl_name}" "${remote_fileurl_backup_name}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${hash}"
 	fn_fetch_file "${remote_fileurl}" "${remote_fileurl_backup}" "${remote_fileurl_name}" "${remote_fileurl_backup_name}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${hash}"
 }
 }
 
 
+fn_check_file_github(){
+	github_fileurl_dir="${1}"
+	github_fileurl_name="${2}"
+	if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
+		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_fileurl_dir}/${github_fileurl_name}"
+		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_fileurl_dir}/${github_fileurl_name}"
+	else
+		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_fileurl_dir}/${github_fileurl_name}"
+		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/${github_fileurl_dir}/${github_fileurl_name}"
+	fi
+	remote_fileurl_name="GitHub"
+	remote_fileurl_backup_name="Bitbucket"
+	fn_check_file "${remote_fileurl}" "${remote_fileurl_backup}" "${remote_fileurl_name}" "${remote_fileurl_backup_name}" "${github_fileurl_name}"
+}
+
 # Fetches config files from the Git repo.
 # Fetches config files from the Git repo.
 fn_fetch_config(){
 fn_fetch_config(){
-	github_file_url_dir="${1}"
-	github_file_url_name="${2}"
+	github_fileurl_dir="${1}"
+	github_fileurl_name="${2}"
 	# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
 	# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
 	if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
 	if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
-		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}"
-		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
+		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_fileurl_dir}/${github_fileurl_name}"
+		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_fileurl_dir}/${github_fileurl_name}"
 	else
 	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}"
+		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_fileurl_dir}/${github_fileurl_name}"
+		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/${github_fileurl_dir}/${github_fileurl_name}"
 	fi
 	fi
 	remote_fileurl_name="GitHub"
 	remote_fileurl_name="GitHub"
 	remote_fileurl_backup_name="Bitbucket"
 	remote_fileurl_backup_name="Bitbucket"
@@ -427,20 +511,20 @@ fn_fetch_config(){
 
 
 # Fetches modules from the Git repo during first download.
 # Fetches modules from the Git repo during first download.
 fn_fetch_function(){
 fn_fetch_function(){
-	github_file_url_dir="lgsm/functions"
-	github_file_url_name="${functionfile}"
+	github_fileurl_dir="lgsm/functions"
+	github_fileurl_name="${functionfile}"
 		# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
 		# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
 	if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
 	if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
-		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}"
-		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
+		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_fileurl_dir}/${github_fileurl_name}"
+		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_fileurl_dir}/${github_fileurl_name}"
 	else
 	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}"
+		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_fileurl_dir}/${github_fileurl_name}"
+		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/${github_fileurl_dir}/${github_fileurl_name}"
 	fi
 	fi
 	remote_fileurl_name="GitHub"
 	remote_fileurl_name="GitHub"
 	remote_fileurl_backup_name="Bitbucket"
 	remote_fileurl_backup_name="Bitbucket"
 	local_filedir="${functionsdir}"
 	local_filedir="${functionsdir}"
-	local_filename="${github_file_url_name}"
+	local_filename="${github_fileurl_name}"
 	chmodx="chmodx"
 	chmodx="chmodx"
 	run="run"
 	run="run"
 	forcedl="noforce"
 	forcedl="noforce"
@@ -451,20 +535,20 @@ fn_fetch_function(){
 
 
 # Fetches modules from the Git repo during update-lgsm.
 # Fetches modules from the Git repo during update-lgsm.
 fn_update_function(){
 fn_update_function(){
-	github_file_url_dir="lgsm/functions"
-	github_file_url_name="${functionfile}"
+	github_fileurl_dir="lgsm/functions"
+	github_fileurl_name="${functionfile}"
 	# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
 	# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
 	if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
 	if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
-		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}"
-		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
+		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_fileurl_dir}/${github_fileurl_name}"
+		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_fileurl_dir}/${github_fileurl_name}"
 	else
 	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}"
+		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_fileurl_dir}/${github_fileurl_name}"
+		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/${github_fileurl_dir}/${github_fileurl_name}"
 	fi
 	fi
 	remote_fileurl_name="GitHub"
 	remote_fileurl_name="GitHub"
 	remote_fileurl_backup_name="Bitbucket"
 	remote_fileurl_backup_name="Bitbucket"
 	local_filedir="${functionsdir}"
 	local_filedir="${functionsdir}"
-	local_filename="${github_file_url_name}"
+	local_filename="${github_fileurl_name}"
 	chmodx="chmodx"
 	chmodx="chmodx"
 	run="norun"
 	run="norun"
 	forcedl="noforce"
 	forcedl="noforce"

+ 1 - 1
lgsm/functions/core_functions.sh

@@ -8,7 +8,7 @@
 
 
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 
-modulesversion="v21.2.5"
+modulesversion="v21.3.2"
 
 
 # Core
 # Core
 
 

+ 1 - 1
lgsm/functions/core_getopt.sh

@@ -134,7 +134,7 @@ if [ "${shortname}" == "squad" ]; then
 fi
 fi
 
 
 ## Mods commands.
 ## Mods commands.
-if [ "${engine}" == "source" ]||[ "${shortname}" == "rust" ]||[ "${shortname}" == "hq" ]||[ "${shortname}" == "sdtd" ]||[ "${shortname}" == "cs" ]||[ "${shortname}" == "dod" ]||[ "${shortname}" == "tfc" ]||[ "${shortname}" == "ns" ]||[ "${shortname}" == "ts" ]||[ "${shortname}" == "hldm" ]; then
+if [ "${engine}" == "source" ]||[ "${shortname}" == "rust" ]||[ "${shortname}" == "hq" ]||[ "${shortname}" == "sdtd" ]||[ "${shortname}" == "cs" ]||[ "${shortname}" == "dod" ]||[ "${shortname}" == "tfc" ]||[ "${shortname}" == "ns" ]||[ "${shortname}" == "ts" ]||[ "${shortname}" == "hldm" ]||[ "${shortname}" == "vh" ]; then
 	currentopt+=( "${cmd_mods_install[@]}" "${cmd_mods_remove[@]}" "${cmd_mods_update[@]}" )
 	currentopt+=( "${cmd_mods_install[@]}" "${cmd_mods_remove[@]}" "${cmd_mods_update[@]}" )
 fi
 fi
 
 

+ 14 - 0
lgsm/functions/fix_vh.sh

@@ -7,3 +7,17 @@
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 
 export LD_LIBRARY_PATH=./linux64:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=./linux64:$LD_LIBRARY_PATH
+
+# special check if Valheim Plus is installed
+modsdir="${lgsmdir}/mods"
+modsinstalledlistfullpath="${modsdir}/installed-mods.txt"
+if [ -f "${modsinstalledlistfullpath}" ]; then
+	if grep -qE "^valheimplus" "${modsinstalledlistfullpath}"
+	then
+		if ! grep -qE "^executable=\"./start_server_bepinex.sh\"" "${configdirserver}/${selfname}.cfg"
+		then
+			echo 'executable="./start_server_bepinex.sh"' >> "${configdirserver}/${selfname}.cfg"
+			executeable="./start_server_bepinex.sh"
+		fi
+	fi
+fi

+ 110 - 95
lgsm/functions/info_distro.sh

@@ -10,19 +10,19 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 
 ### Game Server pid
 ### Game Server pid
 if [ "${status}" == "1" ]; then
 if [ "${status}" == "1" ]; then
-	gameserverpid=$(tmux list-sessions -F "#{session_name} #{pane_pid}" | grep "^${sessionname} " | awk '{print $NF}')
+	gameserverpid="$(tmux list-sessions -F "#{session_name} #{pane_pid}" | grep "^${sessionname} " | awk '{print $NF}')"
 	if [ "${engine}" == "source" ]; then
 	if [ "${engine}" == "source" ]; then
-		srcdslinuxpid=$(ps -ef | grep -v grep | grep "${gameserverpid}" | grep srcds_linux | awk '{print $2}')
+		srcdslinuxpid="$(ps -ef | grep -v grep | grep "${gameserverpid}" | grep srcds_linux | awk '{print $2}')"
 	elif [ "${engine}" == "goldsrc" ]; then
 	elif [ "${engine}" == "goldsrc" ]; then
-		hldslinuxpid=$(ps -ef | grep -v grep | grep "${gameserverpid}" | grep hlds_linux | awk '{print $2}')
+		hldslinuxpid="$(ps -ef | grep -v grep | grep "${gameserverpid}" | grep hlds_linux | awk '{print $2}')"
 	fi
 	fi
 fi
 fi
 ### Distro information
 ### Distro information
 
 
 ## Distro
 ## Distro
 # Returns architecture, kernel and distro/os.
 # Returns architecture, kernel and distro/os.
-arch=$(uname -m)
-kernel=$(uname -r)
+arch="$(uname -m)"
+kernel="$(uname -r)"
 
 
 # Distro Name - Ubuntu 16.04 LTS
 # Distro Name - Ubuntu 16.04 LTS
 # Distro Version - 16.04
 # Distro Version - 16.04
@@ -33,46 +33,56 @@ kernel=$(uname -r)
 distro_info_array=( os-release lsb_release hostnamectl debian_version redhat-release )
 distro_info_array=( os-release lsb_release hostnamectl debian_version redhat-release )
 for distro_info in "${distro_info_array[@]}"; do
 for distro_info in "${distro_info_array[@]}"; do
 	if [ -f "/etc/os-release" ]&&[ "${distro_info}" == "os-release" ]; then
 	if [ -f "/etc/os-release" ]&&[ "${distro_info}" == "os-release" ]; then
-		distroname=$(grep PRETTY_NAME /etc/os-release | sed 's/PRETTY_NAME=//g' | tr -d '="' | sed 's/\"//g')
-		distroversion=$(grep VERSION_ID /etc/os-release | sed 's/VERSION_ID=//g' | sed 's/\"//g')
-		distroid=$(grep ID /etc/os-release | grep -v _ID | grep -v ID_ | sed 's/ID=//g' | sed 's/\"//g')
-		distrocodename=$(grep VERSION_CODENAME /etc/os-release | sed 's/VERSION_CODENAME=//g' | sed 's/\"//g')
+		distroname="$(grep "PRETTY_NAME" /etc/os-release | awk -F\= '{gsub(/"/,"",$2);print $2}')"
+		distroversion="$(grep "VERSION_ID" /etc/os-release | awk -F\= '{gsub(/"/,"",$2);print $2}')"
+		# Special var for rhel like distros to removed point in number e.g 8.4 to just 8.
+		distroversionrh="$(sed -nr 's/^VERSION_ID="([0-9]*).+?"/\1/p' /etc/os-release)"
+		distroid="$(grep "ID=" /etc/os-release | grep -v _ID | awk -F\= '{gsub(/"/,"",$2);print $2}')"
+		distroidlike="$(grep "ID_LIKE=" /etc/os-release | grep -v _ID | awk -F\= '{gsub(/"/,"",$2);print $2}')"
+		distrocodename="$(grep "VERSION_CODENAME" /etc/os-release | awk -F\= '{gsub(/"/,"",$2);print $2}')"
 	elif [ "$(command -v lsb_release 2>/dev/null)" ]&&[ "${distro_info}" == "lsb_release" ]; then
 	elif [ "$(command -v lsb_release 2>/dev/null)" ]&&[ "${distro_info}" == "lsb_release" ]; then
 		if [ -z "${distroname}" ];then
 		if [ -z "${distroname}" ];then
-			distroname=$(lsb_release -sd)
+			distroname="$(lsb_release -sd)"
 		elif [ -z "${distroversion}" ]; then
 		elif [ -z "${distroversion}" ]; then
-			distroversion=$(lsb_release -sr)
+			distroversion="$(lsb_release -sr)"
 		elif [ -z "${distroid}" ]; then
 		elif [ -z "${distroid}" ]; then
-			distroid=$(lsb_release -si)
+			distroid="$(lsb_release -si)"
 		elif [ -z "${distrocodename}" ]; then
 		elif [ -z "${distrocodename}" ]; then
-			distrocodename=$(lsb_release -sc)
+			distrocodename="$(lsb_release -sc)"
 		fi
 		fi
 	elif [ "$(command -v hostnamectl 2>/dev/null)" ]&&[ "${distro_info}" == "hostnamectl" ]; then
 	elif [ "$(command -v hostnamectl 2>/dev/null)" ]&&[ "${distro_info}" == "hostnamectl" ]; then
 		if [ -z "${distroname}" ];then
 		if [ -z "${distroname}" ];then
-			distroname=$(hostnamectl | grep "Operating System" | sed 's/Operating System: //g')
+			distroname="$(hostnamectl | grep "Operating System" | sed 's/Operating System: //g')"
 		fi
 		fi
 	elif [ -f "/etc/debian_version" ]&&[ "${distro_info}" == "debian_version" ]; then
 	elif [ -f "/etc/debian_version" ]&&[ "${distro_info}" == "debian_version" ]; then
 		if [ -z "${distroname}" ]; then
 		if [ -z "${distroname}" ]; then
 			distroname="Debian $(cat /etc/debian_version)"
 			distroname="Debian $(cat /etc/debian_version)"
 		elif [ -z "${distroversion}" ]; then
 		elif [ -z "${distroversion}" ]; then
-			distroversion=$(cat /etc/debian_version)
+			distroversion="$(cat /etc/debian_version)"
 		elif [ -z "${distroid}" ]; then
 		elif [ -z "${distroid}" ]; then
 			distroid="debian"
 			distroid="debian"
 		fi
 		fi
 	elif [ -f "/etc/redhat-release" ]&&[ "${distro_info}" == "redhat-release" ]; then
 	elif [ -f "/etc/redhat-release" ]&&[ "${distro_info}" == "redhat-release" ]; then
 		if [ -z "${distroname}" ]; then
 		if [ -z "${distroname}" ]; then
-			distroname=$(cat /etc/redhat-release)
+			distroname="$(cat /etc/redhat-release)"
 		elif [ -z "${distroversion}" ]; then
 		elif [ -z "${distroversion}" ]; then
-			distroversion=$(rpm -qa \*-release | grep -Ei "oracle|redhat|centos|fedora" | cut -d"-" -f3)
+			distroversion="$(rpm -qa \*-release | grep -Ei "oracle|redhat|centos|fedora" | cut -d"-" -f3)"
 		elif [ -z "${distroid}" ]; then
 		elif [ -z "${distroid}" ]; then
-			distroid=$(awk '{print $1}' /etc/redhat-release)
+			distroid="$(awk '{print $1}' /etc/redhat-release)"
 		fi
 		fi
 	fi
 	fi
 done
 done
 
 
+# some RHEL based distros use 8.4 instead of just 8.
+if [[ "${distroidlike}" == *"rhel"* ]]||[ "${distroid}" == "rhel" ]; then
+	distroversioncsv="${distroversionrh}"
+else
+	distroversioncsv="${distroversion}"
+fi
+
 ## Glibc version
 ## Glibc version
 # e.g: 1.17
 # e.g: 1.17
-glibcversion=$(ldd --version | sed -n '1s/.* //p')
+glibcversion="$(ldd --version | sed -n '1s/.* //p')"
 
 
 ## tmux version
 ## tmux version
 # e.g: tmux 1.6
 # e.g: tmux 1.6
@@ -84,34 +94,38 @@ else
 	if [ "${tmuxvdigit}" -lt "16" ]; then
 	if [ "${tmuxvdigit}" -lt "16" ]; then
 		tmuxv="$(tmux -V) (>= 1.6 required for console log)"
 		tmuxv="$(tmux -V) (>= 1.6 required for console log)"
 	else
 	else
-		tmuxv=$(tmux -V)
+		tmuxv="$(tmux -V)"
 	fi
 	fi
 fi
 fi
 
 
 if [ "$(command -V java 2>/dev/null)" ]; then
 if [ "$(command -V java 2>/dev/null)" ]; then
-	javaversion=$(java -version 2>&1 | grep "version")
+	javaversion="$(java -version 2>&1 | grep "version")"
+fi
+
+if [ "$(command -v mono 2>/dev/null)" ]; then
+	monoversion="$(mono --version 2>&1 | grep -Po '(?<=version )\d')"
 fi
 fi
 
 
 ## Uptime
 ## Uptime
-uptime=$(</proc/uptime)
+uptime="$(</proc/uptime)"
 uptime=${uptime/[. ]*/}
 uptime=${uptime/[. ]*/}
-minutes=$(( uptime/60%60 ))
-hours=$(( uptime/60/60%24 ))
-days=$(( uptime/60/60/24 ))
+minutes="$(( uptime/60%60 ))"
+hours="$(( uptime/60/60%24 ))"
+days="$(( uptime/60/60/24 ))"
 
 
 ### Performance information
 ### Performance information
 
 
 ## Average server load
 ## Average server load
-load=$(uptime|awk -F 'load average: ' '{ print $2 }')
+load="$(uptime|awk -F 'load average: ' '{ print $2 }')"
 
 
 ## CPU information
 ## CPU information
-cpumodel=$(awk -F: '/model name/ {name=$2} END {print name}' /proc/cpuinfo | sed 's/^[ \t]*//;s/[ \t]*$//')
-cpucores=$(awk -F: '/model name/ {core++} END {print core}' /proc/cpuinfo)
-cpufreqency=$(awk -F: '/cpu MHz/ {freq=$2} END {print freq}' /proc/cpuinfo | sed 's/^[ \t]*//;s/[ \t]*$//')
+cpumodel="$(awk -F: '/model name/ {name=$2} END {print name}' /proc/cpuinfo | sed 's/^[ \t]*//;s/[ \t]*$//')"
+cpucores="$(awk -F: '/model name/ {core++} END {print core}' /proc/cpuinfo)"
+cpufreqency="$(awk -F: '/cpu MHz/ {freq=$2} END {print freq}' /proc/cpuinfo | sed 's/^[ \t]*//;s/[ \t]*$//')"
 # CPU usage of the game server pid
 # CPU usage of the game server pid
 if [ -n "${gameserverpid}" ]; then
 if [ -n "${gameserverpid}" ]; then
-	cpuused=$(ps --forest -o pcpu -g "${gameserverpid}"|awk '{s+=$1} END {print s}')
-	cpuusedmhz=$(echo "${cpufreqency} * ${cpuused} / 100" | bc )
+	cpuused="$(ps --forest -o pcpu -g "${gameserverpid}"|awk '{s+=$1} END {print s}')"
+	cpuusedmhz="$(echo "${cpufreqency} * ${cpuused} / 100" | bc)"
 fi
 fi
 
 
 ## Memory information
 ## Memory information
@@ -122,86 +136,86 @@ if [ "$(command -v numfmt 2>/dev/null)" ]; then
 	# Issue #2005 - Kernel 3.14+ contains MemAvailable which should be used. All others will be calculated.
 	# Issue #2005 - Kernel 3.14+ contains MemAvailable which should be used. All others will be calculated.
 
 
 	# get the raw KB values of these fields.
 	# get the raw KB values of these fields.
-	physmemtotalkb=$(grep MemTotal /proc/meminfo | awk '{print $2}')
-	physmemfreekb=$(grep ^MemFree /proc/meminfo | awk '{print $2}')
-	physmembufferskb=$(grep ^Buffers /proc/meminfo | awk '{print $2}')
-	physmemcachedkb=$(grep ^Cached /proc/meminfo | awk '{print $2}')
-	physmemreclaimablekb=$(grep ^SReclaimable /proc/meminfo | awk '{print $2}')
+	physmemtotalkb="$(grep MemTotal /proc/meminfo | awk '{print $2}')"
+	physmemfreekb="$(grep ^MemFree /proc/meminfo | awk '{print $2}')"
+	physmembufferskb="$(grep ^Buffers /proc/meminfo | awk '{print $2}')"
+	physmemcachedkb="$(grep ^Cached /proc/meminfo | awk '{print $2}')"
+	physmemreclaimablekb="$(grep ^SReclaimable /proc/meminfo | awk '{print $2}')"
 
 
 	# check if MemAvailable Exists.
 	# check if MemAvailable Exists.
 	if grep -q ^MemAvailable /proc/meminfo; then
 	if grep -q ^MemAvailable /proc/meminfo; then
-	    physmemactualfreekb=$(grep ^MemAvailable /proc/meminfo | awk '{print $2}')
+		physmemactualfreekb="$(grep ^MemAvailable /proc/meminfo | awk '{print $2}')"
 	else
 	else
-	    physmemactualfreekb=$((physmemfreekb+physmembufferskb+physmemcachedkb))
+		physmemactualfreekb="$((physmemfreekb+physmembufferskb+physmemcachedkb))"
 	fi
 	fi
 
 
 	# Available RAM and swap.
 	# Available RAM and swap.
-	physmemtotalmb=$((physmemtotalkb/1024))
-	physmemtotal=$(numfmt --to=iec --from=iec --suffix=B "${physmemtotalkb}K")
-	physmemfree=$(numfmt --to=iec --from=iec --suffix=B "${physmemactualfreekb}K")
-	physmemused=$(numfmt --to=iec --from=iec --suffix=B "$((physmemtotalkb-physmemfreekb-physmembufferskb-physmemcachedkb-physmemreclaimablekb))K")
-	physmemavailable=$(numfmt --to=iec --from=iec --suffix=B "${physmemactualfreekb}K")
-	physmemcached=$(numfmt --to=iec --from=iec --suffix=B "$((physmemcachedkb+physmemreclaimablekb))K")
-
-	swaptotal=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^SwapTotal /proc/meminfo | awk '{print $2}')K")
-	swapfree=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^SwapFree /proc/meminfo | awk '{print $2}')K")
-	swapused=$(numfmt --to=iec --from=iec --suffix=B "$(($(grep ^SwapTotal /proc/meminfo | awk '{print $2}')-$(grep ^SwapFree /proc/meminfo | awk '{print $2}')))K")
+	physmemtotalmb="$((physmemtotalkb/1024))"
+	physmemtotal="$(numfmt --to=iec --from=iec --suffix=B "${physmemtotalkb}K")"
+	physmemfree="$(numfmt --to=iec --from=iec --suffix=B "${physmemactualfreekb}K")"
+	physmemused="$(numfmt --to=iec --from=iec --suffix=B "$((physmemtotalkb-physmemfreekb-physmembufferskb-physmemcachedkb-physmemreclaimablekb))K")"
+	physmemavailable="$(numfmt --to=iec --from=iec --suffix=B "${physmemactualfreekb}K")"
+	physmemcached="$(numfmt --to=iec --from=iec --suffix=B "$((physmemcachedkb+physmemreclaimablekb))K")"
+
+	swaptotal="$(numfmt --to=iec --from=iec --suffix=B "$(grep ^SwapTotal /proc/meminfo | awk '{print $2}')K")"
+	swapfree="$(numfmt --to=iec --from=iec --suffix=B "$(grep ^SwapFree /proc/meminfo | awk '{print $2}')K")"
+	swapused="$(numfmt --to=iec --from=iec --suffix=B "$(($(grep ^SwapTotal /proc/meminfo | awk '{print $2}')-$(grep ^SwapFree /proc/meminfo | awk '{print $2}')))K")"
 	# RAM usage of the game server pid
 	# RAM usage of the game server pid
 	# MB
 	# MB
 	if [ "${gameserverpid}" ]; then
 	if [ "${gameserverpid}" ]; then
-		memused=$(ps --forest -o rss -g "${gameserverpid}" | awk '{s+=$1} END {print s}'| awk '{$1/=1024;printf "%.0f",$1}{print $2}')
+		memused="$(ps --forest -o rss -g "${gameserverpid}" | awk '{s+=$1} END {print s}'| awk '{$1/=1024;printf "%.0f",$1}{print $2}')"
 	# %
 	# %
-		pmemused=$(ps --forest -o %mem -g "${gameserverpid}" | awk '{s+=$1} END {print s}')
+		pmemused="$(ps --forest -o %mem -g "${gameserverpid}" | awk '{s+=$1} END {print s}')"
 	fi
 	fi
 else
 else
-# Older distros will need to use free.
+	# Older distros will need to use free.
 	# Older versions of free do not support -h option.
 	# Older versions of free do not support -h option.
 	if [ "$(free -h > /dev/null 2>&1; echo $?)" -ne "0" ]; then
 	if [ "$(free -h > /dev/null 2>&1; echo $?)" -ne "0" ]; then
 		humanreadable="-m"
 		humanreadable="-m"
 	else
 	else
 		humanreadable="-h"
 		humanreadable="-h"
 	fi
 	fi
-	physmemtotalmb=$(free -m | awk '/Mem:/ {print $2}')
-	physmemtotal=$(free ${humanreadable} | awk '/Mem:/ {print $2}')
-	physmemfree=$(free ${humanreadable} | awk '/Mem:/ {print $4}')
-	physmemused=$(free ${humanreadable} | awk '/Mem:/ {print $3}')
+	physmemtotalmb="$(free -m | awk '/Mem:/ {print $2}')"
+	physmemtotal="$(free ${humanreadable} | awk '/Mem:/ {print $2}')"
+	physmemfree="$(free ${humanreadable} | awk '/Mem:/ {print $4}')"
+	physmemused="$(free ${humanreadable} | awk '/Mem:/ {print $3}')"
 
 
-	oldfree=$(free ${humanreadable} | awk '/cache:/')
+	oldfree="$(free ${humanreadable} | awk '/cache:/')"
 	if [ "${oldfree}" ]; then
 	if [ "${oldfree}" ]; then
 		physmemavailable="n/a"
 		physmemavailable="n/a"
 		physmemcached="n/a"
 		physmemcached="n/a"
 	else
 	else
-		physmemavailable=$(free ${humanreadable} | awk '/Mem:/ {print $7}')
-		physmemcached=$(free ${humanreadable} | awk '/Mem:/ {print $6}')
+		physmemavailable="$(free ${humanreadable} | awk '/Mem:/ {print $7}')"
+		physmemcached="$(free ${humanreadable} | awk '/Mem:/ {print $6}')"
 	fi
 	fi
 
 
-	swaptotal=$(free ${humanreadable} | awk '/Swap:/ {print $2}')
-	swapused=$(free ${humanreadable} | awk '/Swap:/ {print $3}')
-	swapfree=$(free ${humanreadable} | awk '/Swap:/ {print $4}')
+	swaptotal="$(free ${humanreadable} | awk '/Swap:/ {print $2}')"
+	swapused="$(free ${humanreadable} | awk '/Swap:/ {print $3}')"
+	swapfree="$(free ${humanreadable} | awk '/Swap:/ {print $4}')"
 fi
 fi
 
 
 ### Disk information
 ### Disk information
 
 
 ## Available disk space on the partition.
 ## Available disk space on the partition.
-filesystem=$(LC_ALL=C df -hP "${rootdir}" | tail -n 1 | awk '{print $1}')
-totalspace=$(LC_ALL=C df -hP "${rootdir}" | tail -n 1 | awk '{print $2}')
-usedspace=$(LC_ALL=C df -hP "${rootdir}" | tail -n 1 | awk '{print $3}')
-availspace=$(LC_ALL=C df -hP "${rootdir}" | tail -n 1 | awk '{print $4}')
+filesystem="$(LC_ALL=C df -hP "${rootdir}" | tail -n 1 | awk '{print $1}')"
+totalspace="$(LC_ALL=C df -hP "${rootdir}" | tail -n 1 | awk '{print $2}')"
+usedspace="$(LC_ALL=C df -hP "${rootdir}" | tail -n 1 | awk '{print $3}')"
+availspace="$(LC_ALL=C df -hP "${rootdir}" | tail -n 1 | awk '{print $4}')"
 
 
 ## LinuxGSM used space total.
 ## LinuxGSM used space total.
-rootdirdu=$(du -sh "${rootdir}" 2> /dev/null | awk '{print $1}')
+rootdirdu="$(du -sh "${rootdir}" 2> /dev/null | awk '{print $1}')"
 if [ -z "${rootdirdu}" ]; then
 if [ -z "${rootdirdu}" ]; then
 	rootdirdu="0M"
 	rootdirdu="0M"
 fi
 fi
 
 
 ## LinuxGSM used space in serverfiles dir.
 ## LinuxGSM used space in serverfiles dir.
-serverfilesdu=$(du -sh "${serverfiles}" 2> /dev/null | awk '{print $1}')
+serverfilesdu="$(du -sh "${serverfiles}" 2> /dev/null | awk '{print $1}')"
 if [ -z "${serverfilesdu}" ]; then
 if [ -z "${serverfilesdu}" ]; then
 	serverfilesdu="0M"
 	serverfilesdu="0M"
 fi
 fi
 
 
 ## LinuxGSM used space total minus backup dir.
 ## LinuxGSM used space total minus backup dir.
-rootdirduexbackup=$(du -sh --exclude="${backupdir}" "${serverfiles}" 2> /dev/null | awk '{print $1}')
+rootdirduexbackup="$(du -sh --exclude="${backupdir}" "${serverfiles}" 2> /dev/null | awk '{print $1}')"
 if [ -z "${rootdirduexbackup}" ]; then
 if [ -z "${rootdirduexbackup}" ]; then
 	rootdirduexbackup="0M"
 	rootdirduexbackup="0M"
 fi
 fi
@@ -209,7 +223,7 @@ fi
 ## Backup info
 ## Backup info
 if [ -d "${backupdir}" ]; then
 if [ -d "${backupdir}" ]; then
 	# Used space in backups dir.
 	# Used space in backups dir.
-	backupdirdu=$(du -sh "${backupdir}" | awk '{print $1}')
+	backupdirdu="$(du -sh "${backupdir}" | awk '{print $1}')"
 	# If no backup dir, size is 0M.
 	# If no backup dir, size is 0M.
 	if [ -z "${backupdirdu}" ]; then
 	if [ -z "${backupdirdu}" ]; then
 		backupdirdu="0M"
 		backupdirdu="0M"
@@ -221,25 +235,25 @@ if [ -d "${backupdir}" ]; then
 	# If there are backups in backup dir.
 	# If there are backups in backup dir.
 	if [ "$(find "${backupdir}" -name "*.tar.gz" | wc -l)" -ne "0" ]; then
 	if [ "$(find "${backupdir}" -name "*.tar.gz" | wc -l)" -ne "0" ]; then
 		# number of backups.
 		# number of backups.
-		backupcount=$(find "${backupdir}"/*.tar.gz | wc -l)
+		backupcount="$(find "${backupdir}"/*.tar.gz | wc -l)"
 		# most recent backup.
 		# most recent backup.
-		lastbackup=$(ls -1t "${backupdir}"/*.tar.gz | head -1)
+		lastbackup="$(ls -1t "${backupdir}"/*.tar.gz | head -1)"
 		# date of most recent backup.
 		# date of most recent backup.
-		lastbackupdate=$(date -r "${lastbackup}")
+		lastbackupdate="$(date -r "${lastbackup}")"
 		# no of days since last backup.
 		# no of days since last backup.
-		lastbackupdaysago=$(( ( $(date +'%s') - $(date -r "${lastbackup}" +'%s') )/60/60/24 ))
+		lastbackupdaysago="$(( ( $(date +'%s') - $(date -r "${lastbackup}" +'%s') )/60/60/24 ))"
 		# size of most recent backup.
 		# size of most recent backup.
-		lastbackupsize=$(du -h "${lastbackup}" | awk '{print $1}')
+		lastbackupsize="$(du -h "${lastbackup}" | awk '{print $1}')"
 	fi
 	fi
 fi
 fi
 
 
 # Network Interface name
 # Network Interface name
-netint=$(ip -o addr | grep "${ip}" | awk '{print $2}')
-netlink=$(ethtool "${netint}" 2>/dev/null| grep Speed | awk '{print $2}')
+netint=$(${ipcommand} -o addr | grep "${ip}" | awk '{print $2}')
+netlink=$(${ethtoolcommand} "${netint}" 2>/dev/null| grep Speed | awk '{print $2}')
 
 
 # External IP address
 # External IP address
 if [ -z "${extip}" ]; then
 if [ -z "${extip}" ]; then
-	extip=$(curl --connect-timeout 10 -s https://api.ipify.org 2>/dev/null)
+	extip="$(curl --connect-timeout 10 -s https://api.ipify.org 2>/dev/null)"
 	exitcode=$?
 	exitcode=$?
 	# Should ifconfig.co return an error will use last known IP.
 	# Should ifconfig.co return an error will use last known IP.
 	if [ ${exitcode} -eq 0 ]; then
 	if [ ${exitcode} -eq 0 ]; then
@@ -247,14 +261,14 @@ if [ -z "${extip}" ]; then
 			echo -e "${extip}" > "${tmpdir}/extip.txt"
 			echo -e "${extip}" > "${tmpdir}/extip.txt"
 		else
 		else
 			if [ -f "${tmpdir}/extip.txt" ]; then
 			if [ -f "${tmpdir}/extip.txt" ]; then
-				extip=$(cat "${tmpdir}/extip.txt")
+				extip="$(cat "${tmpdir}/extip.txt")"
 			else
 			else
 				fn_print_error_nl "Unable to get external IP"
 				fn_print_error_nl "Unable to get external IP"
 			fi
 			fi
 		fi
 		fi
 	else
 	else
 		if [ -f "${tmpdir}/extip.txt" ]; then
 		if [ -f "${tmpdir}/extip.txt" ]; then
-			extip=$(cat "${tmpdir}/extip.txt")
+			extip="$(cat "${tmpdir}/extip.txt")"
 		else
 		else
 			fn_print_error_nl "Unable to get external IP"
 			fn_print_error_nl "Unable to get external IP"
 		fi
 		fi
@@ -271,26 +285,27 @@ else
 fi
 fi
 
 
 # Steam Master Server - checks if detected by master server.
 # Steam Master Server - checks if detected by master server.
-if [ "$(command -v jq 2>/dev/null)" ]; then
-	if [ "${ip}" ]&&[ "${port}" ]; then
-		if [ "${steammaster}" == "true" ]||[ ${commandname} == "DEV-QUERY-RAW" ]; then
-			# Will query server IP addresses first.
-			for queryip in "${queryips[@]}"; do
-				masterserver="$(curl --connect-timeout 10 -m 3 -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${queryip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l 2>/dev/null)"
-			done
-			# Should that not work it will try the external IP.
-			if [ "${masterserver}" == "0" ]; then
-				masterserver="$(curl --connect-timeout 10 -m 3 -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${extip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l 2>/dev/null)"
-			fi
-			if [ "${masterserver}" == "0" ]; then
-				displaymasterserver="false"
-			else
-				displaymasterserver="true"
+if [ -z "${displaymasterserver}" ]; then
+	if [ "$(command -v jq 2>/dev/null)" ]; then
+		if [ "${ip}" ]&&[ "${port}" ]; then
+			if [ "${steammaster}" == "true" ]||[ "${commandname}" == "DEV-QUERY-RAW" ]; then
+				# Will query server IP addresses first.
+				for queryip in "${queryips[@]}"; do
+					masterserver="$(curl --connect-timeout 10 -m 3 -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${queryip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l 2>/dev/null)"
+				done
+				# Should that not work it will try the external IP.
+				if [ "${masterserver}" == "0" ]; then
+					masterserver="$(curl --connect-timeout 10 -m 3 -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${extip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l 2>/dev/null)"
+				fi
+				if [ "${masterserver}" == "0" ]; then
+					displaymasterserver="false"
+				else
+					displaymasterserver="true"
+				fi
 			fi
 			fi
 		fi
 		fi
 	fi
 	fi
 fi
 fi
-
 # Sets the SteamCMD glibc requirement if the game server requirement is less or not required.
 # Sets the SteamCMD glibc requirement if the game server requirement is less or not required.
 if [ "${appid}" ]; then
 if [ "${appid}" ]; then
 	if [ "${glibc}" = "null" ]||[ -z "${glibc}" ]||[ "$(printf '%s\n'${glibc}'\n' "2.14" | sort -V | head -n 1)" != "2.14" ]; then
 	if [ "${glibc}" = "null" ]||[ -z "${glibc}" ]||[ "$(printf '%s\n'${glibc}'\n' "2.14" | sort -V | head -n 1)" != "2.14" ]; then

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 236 - 116
lgsm/functions/info_game.sh


+ 39 - 2
lgsm/functions/info_messages.sh

@@ -339,6 +339,11 @@ fn_info_message_gameserver(){
 			fi
 			fi
 		fi
 		fi
 
 
+		# Reverved Slots
+		if [ -n "${statspassword}" ]; then
+			echo -e "${lightblue}Reserved Slots:\t${default}${reservedslots}"
+		fi
+
 		# Bots
 		# Bots
 		if [ -n "${gdbots}" ]; then
 		if [ -n "${gdbots}" ]; then
 			echo -e "${lightblue}Bots:\t${default}${gdbots}"
 			echo -e "${lightblue}Bots:\t${default}${gdbots}"
@@ -653,7 +658,7 @@ fn_info_message_ports_edit(){
 
 
 	startparameterslocation="${red}UNKNOWN${default}"
 	startparameterslocation="${red}UNKNOWN${default}"
 	# engines/games that require editing in the config file.
 	# engines/games that require editing in the config file.
-	local ports_edit_array=( "ac" "arma3" "bo" "bt" "dst" "eco" "idtech2" "idtech3" "idtech3_ql" "jc2" "jc3" "lwjgl2" "mcb" "mumble" "pc" "pz" "qw" "refractor" "renderware" "rw" "sb" "sdtd" "st" "ts3" "tw" "terraria" "unreal" "unreal2" "unreal3" "vints" "wurm")
+	local ports_edit_array=( "ac" "arma3" "bo" "bt" "dst" "eco" "idtech2" "idtech3" "idtech3_ql" "jc2" "jc3" "lwjgl2" "mcb" "mumble" "pc" "pz" "qw" "refractor" "renderware" "rw" "sb" "sdtd" "st" "stn" "ts3" "tw" "terraria" "unreal" "unreal2" "unreal3" "vints" "wurm")
 	for port_edit in "${ports_edit_array[@]}"; do
 	for port_edit in "${ports_edit_array[@]}"; do
 		if [ "${shortname}" == "ut3" ]; then
 		if [ "${shortname}" == "ut3" ]; then
 			startparameterslocation="${servercfgdir}/UTWeb.ini"
 			startparameterslocation="${servercfgdir}/UTWeb.ini"
@@ -921,6 +926,14 @@ fn_info_message_csgo(){
 	} | column -s $'\t' -t
 	} | column -s $'\t' -t
 }
 }
 
 
+fn_info_message_dodr(){
+	{
+		fn_port "header"
+		fn_port "Game" port udp
+		fn_port "Query" queryport udp
+	} | column -s $'\t' -t
+}
+
 fn_info_message_dst(){
 fn_info_message_dst(){
 	{
 	{
 		fn_port "header"
 		fn_port "header"
@@ -1016,6 +1029,16 @@ fn_info_message_jk2(){
 	} | column -s $'\t' -t
 	} | column -s $'\t' -t
 }
 }
 
 
+fn_info_message_lo(){
+	echo -e "netstat -atunp | grep MistServer"
+	echo -e ""
+	{
+		echo -e "${lightblue}DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL${default}"
+		echo -e "> Game\tINBOUND\t${port}\tudp"
+		echo -e "> Query\tINBOUND\t${queryport}\tudp"
+	} | column -s $'\t' -t
+}
+
 fn_info_message_kf(){
 fn_info_message_kf(){
 	{
 	{
 	fn_port "header"
 	fn_port "header"
@@ -1340,7 +1363,7 @@ fn_info_message_source(){
 		fn_port "RCON" rconport tcp
 		fn_port "RCON" rconport tcp
 		fn_port "SourceTV" sourcetvport udp
 		fn_port "SourceTV" sourcetvport udp
 		# Will not show if unaviable
 		# Will not show if unaviable
-		if [ "${steamport}" == "0" ]||[ -z "${steamport}" ]; then
+		if [ "${steamport}" == "0" ]||[ -v "${steamport}" ]; then
 			fn_port "Steam" steamport udp
 			fn_port "Steam" steamport udp
 		fi
 		fi
 		fn_port "Client" clientport udp
 		fn_port "Client" clientport udp
@@ -1561,6 +1584,14 @@ fn_info_message_wurm(){
 	} | column -s $'\t' -t
 	} | column -s $'\t' -t
 }
 }
 
 
+fn_info_message_stn(){
+	{
+		fn_port "header"
+		fn_port "Game" port udp
+		fn_port "Query" queryport udp
+	} | column -s $'\t' -t
+}
+
 fn_info_message_select_engine(){
 fn_info_message_select_engine(){
 	# Display details depending on game or engine.
 	# Display details depending on game or engine.
 	if [ "${shortname}" == "ac" ]; then
 	if [ "${shortname}" == "ac" ]; then
@@ -1597,6 +1628,8 @@ fn_info_message_select_engine(){
 		fn_info_message_codwaw
 		fn_info_message_codwaw
 	elif [ "${shortname}" == "col" ]; then
 	elif [ "${shortname}" == "col" ]; then
 		fn_info_message_col
 		fn_info_message_col
+	elif [ "${shortname}" == "dodr" ]; then
+		fn_info_message_dodr
 	elif [ "${shortname}" == "dst" ]; then
 	elif [ "${shortname}" == "dst" ]; then
 		fn_info_message_dst
 		fn_info_message_dst
 	elif [ "${shortname}" == "eco" ]; then
 	elif [ "${shortname}" == "eco" ]; then
@@ -1617,6 +1650,8 @@ fn_info_message_select_engine(){
 		fn_info_message_jc3
 		fn_info_message_jc3
 	elif [ "${shortname}" == "jk2" ]; then
 	elif [ "${shortname}" == "jk2" ]; then
 		fn_info_message_jk2
 		fn_info_message_jk2
+	elif [ "${shortname}" == "lo" ]; then
+		fn_info_message_lo
 	elif [ "${shortname}" == "kf" ]; then
 	elif [ "${shortname}" == "kf" ]; then
 		fn_info_message_kf
 		fn_info_message_kf
 	elif [ "${shortname}" == "kf2" ]; then
 	elif [ "${shortname}" == "kf2" ]; then
@@ -1677,6 +1712,8 @@ fn_info_message_select_engine(){
 		fn_info_message_squad
 		fn_info_message_squad
 	elif [ "${shortname}" == "st" ]; then
 	elif [ "${shortname}" == "st" ]; then
 		fn_info_message_st
 		fn_info_message_st
+	elif [ "${shortname}" == "stn" ]; then
+		fn_info_message_stn
 	elif [ "${shortname}" == "terraria" ]; then
 	elif [ "${shortname}" == "terraria" ]; then
 		fn_info_message_terraria
 		fn_info_message_terraria
 	elif [ "${shortname}" == "ts3" ]; then
 	elif [ "${shortname}" == "ts3" ]; then

+ 13 - 1
lgsm/functions/install_config.sh

@@ -159,7 +159,6 @@ fn_list_config_locations(){
 	fi
 	fi
 	echo -e "LinuxGSM Config: ${lgsmdir}/config-lgsm/${gameservername}"
 	echo -e "LinuxGSM Config: ${lgsmdir}/config-lgsm/${gameservername}"
 	echo -e "Documentation: https://docs.linuxgsm.com/configuration/game-server-config"
 	echo -e "Documentation: https://docs.linuxgsm.com/configuration/game-server-config"
-	echo -e ""
 }
 }
 
 
 if [ "${shortname}" == "sdtd" ]; then
 if [ "${shortname}" == "sdtd" ]; then
@@ -359,6 +358,12 @@ elif [ "${shortname}" == "dod" ]; then
 	fn_default_config_remote
 	fn_default_config_remote
 	fn_set_config_vars
 	fn_set_config_vars
 	fn_list_config_locations
 	fn_list_config_locations
+elif [ "${shortname}" == "dodr" ]; then
+	gamedirname="DayOfDragons"
+	array_configs+=( Game.ini )
+	fn_fetch_default_config
+	fn_default_config_remote
+	fn_list_config_locations
 elif [ "${shortname}" == "dods" ]; then
 elif [ "${shortname}" == "dods" ]; then
 	gamedirname="DayOfDefeatSource"
 	gamedirname="DayOfDefeatSource"
 	array_configs+=( server.cfg )
 	array_configs+=( server.cfg )
@@ -717,6 +722,13 @@ elif [ "${shortname}" == "st" ]; then
 	fn_default_config_remote
 	fn_default_config_remote
 	fn_set_config_vars
 	fn_set_config_vars
 	fn_list_config_locations
 	fn_list_config_locations
+elif [ "${shortname}" == "stn" ]; then
+	gamedirname="SurvivetheNights"
+	array_configs+=( ServerConfig.txt ServerUsers.txt TpPresets.json UserPermissions.json )
+	fn_fetch_default_config
+	fn_default_config_remote
+	fn_set_config_vars
+	fn_list_config_locations
 elif [ "${shortname}" == "sven" ]; then
 elif [ "${shortname}" == "sven" ]; then
 	gamedirname="SvenCoop"
 	gamedirname="SvenCoop"
 	array_configs+=( server.cfg )
 	array_configs+=( server.cfg )

+ 0 - 1
lgsm/functions/install_server_dir.sh

@@ -15,7 +15,6 @@ if [ -d "${serverfiles}" ]; then
 	fn_print_warning_nl "A server is already installed here."
 	fn_print_warning_nl "A server is already installed here."
 fi
 fi
 pwd
 pwd
-echo -e ""
 if [ -z "${autoinstall}" ]; then
 if [ -z "${autoinstall}" ]; then
 	if ! fn_prompt_yn "Continue?" Y; then
 	if ! fn_prompt_yn "Continue?" Y; then
 		exitcode=0
 		exitcode=0

+ 2 - 1
lgsm/functions/install_server_files.sh

@@ -27,7 +27,7 @@ fn_install_server_files(){
 	elif [ "${shortname}" == "codwaw" ]; then
 	elif [ "${shortname}" == "codwaw" ]; then
 		remote_fileurl="http://linuxgsm.download/CallOfDutyWorldAtWar/codwaw-lnxded-1.7-full.tar.xz"; local_filedir="${tmpdir}"; local_filename="codwaw-lnxded-1.7-full.tar.xz"; chmodx="nochmodx" run="norun"; force="noforce"; md5="2c6be1bb66ea631b9b2e7ae6216c6680"
 		remote_fileurl="http://linuxgsm.download/CallOfDutyWorldAtWar/codwaw-lnxded-1.7-full.tar.xz"; local_filedir="${tmpdir}"; local_filename="codwaw-lnxded-1.7-full.tar.xz"; chmodx="nochmodx" run="norun"; force="noforce"; md5="2c6be1bb66ea631b9b2e7ae6216c6680"
 	elif [ "${shortname}" == "etl" ]; then
 	elif [ "${shortname}" == "etl" ]; then
-		remote_fileurl="http://linuxgsm.download/WolfensteinEnemyTerritory/etlegacy-v2.77.1-i386-et-260b.tar.xz"; local_filedir="${tmpdir}"; local_filename="etlegacy-v2.77.1-i386-et-260b.tar.xz"; chmodx="nochmodx" run="norun"; force="noforce"; md5="cc307a9232abd3999be499b42d8e4ea8"
+		remote_fileurl="http://linuxgsm.download/WolfensteinEnemyTerritory/etlegacy-v2.78-i386-et-260b.tar.xz"; local_filedir="${tmpdir}"; local_filename="etlegacy-v2.78-i386-et-260b.tar.xz"; chmodx="nochmodx" run="norun"; force="noforce"; md5="501e442fdac2eeab5e7f51e5b5c27280"
 	elif [ "${shortname}" == "mohaa" ]; then
 	elif [ "${shortname}" == "mohaa" ]; then
 		remote_fileurl="http://linuxgsm.download/MedalofHonorAlliedAssault/moh_revival_v1.12_RC3.5.1.tar.xz"; local_filedir="${tmpdir}"; local_filename="moh_revival_v1.12_RC3.5.1.tar.xz"; chmodx="nochmodx" run="norun"; force="noforce"; md5="7c664538999252eeaf2b6d9949416480"
 		remote_fileurl="http://linuxgsm.download/MedalofHonorAlliedAssault/moh_revival_v1.12_RC3.5.1.tar.xz"; local_filedir="${tmpdir}"; local_filename="moh_revival_v1.12_RC3.5.1.tar.xz"; chmodx="nochmodx" run="norun"; force="noforce"; md5="7c664538999252eeaf2b6d9949416480"
 	elif [ "${shortname}" == "ns" ]; then
 	elif [ "${shortname}" == "ns" ]; then
@@ -73,6 +73,7 @@ echo -e "================================="
 fn_sleep_time
 fn_sleep_time
 
 
 if [ "${appid}" ]; then
 if [ "${appid}" ]; then
+	remotelocation="SteamCMD"
 	fn_dl_steamcmd
 	fn_dl_steamcmd
 fi
 fi
 
 

+ 30 - 2
lgsm/functions/mods_list.sh

@@ -76,6 +76,9 @@ get5lastbuild=$(curl --connect-timeout 10 -sL https://ci.splewis.net/job/get5/la
 get5latestfile=$(echo -e "${get5lastbuild}" | jq -r '.fileName')
 get5latestfile=$(echo -e "${get5lastbuild}" | jq -r '.fileName')
 get5latestfilepath=$(echo -e "${get5lastbuild}" | jq -r '.relativePath')
 get5latestfilepath=$(echo -e "${get5lastbuild}" | jq -r '.relativePath')
 get5url="https://ci.splewis.net/job/get5/lastSuccessfulBuild/artifact/${get5latestfilepath}"
 get5url="https://ci.splewis.net/job/get5/lastSuccessfulBuild/artifact/${get5latestfilepath}"
+csgopracticelatest=$(curl --connect-timeout 10 -sL https://api.github.com/repos/splewis/csgo-practice-mode/releases/latest | jq '.assets[]')
+csgopracticelatestfile=$(echo -e "${csgopracticelatest}" | jq -r '.name')
+csgopracticelatestlink=$(echo -e "${csgopracticelatest}" | jq -r '.browser_download_url')
 csgopuglatest=$(curl --connect-timeout 10 -sL https://api.github.com/repos/splewis/csgo-pug-setup/releases/latest | jq '.assets[]')
 csgopuglatest=$(curl --connect-timeout 10 -sL https://api.github.com/repos/splewis/csgo-pug-setup/releases/latest | jq '.assets[]')
 csgopuglatestfile=$(echo -e "${csgopuglatest}" | jq -r '.name')
 csgopuglatestfile=$(echo -e "${csgopuglatest}" | jq -r '.name')
 csgopuglatestlink=$(echo -e "${csgopuglatest}" | jq -r '.browser_download_url')
 csgopuglatestlink=$(echo -e "${csgopuglatest}" | jq -r '.browser_download_url')
@@ -83,6 +86,8 @@ csgopuglatestlink=$(echo -e "${csgopuglatest}" | jq -r '.browser_download_url')
 oxiderustlatestlink=$(curl --connect-timeout 10 -sL https://api.github.com/repos/OxideMod/Oxide.Rust/releases/latest | jq -r '.assets[]|select(.browser_download_url | contains("linux")) | .browser_download_url')
 oxiderustlatestlink=$(curl --connect-timeout 10 -sL https://api.github.com/repos/OxideMod/Oxide.Rust/releases/latest | jq -r '.assets[]|select(.browser_download_url | contains("linux")) | .browser_download_url')
 oxidehurtworldlatestlink=$(curl --connect-timeout 10 -sL https://api.github.com/repos/OxideMod/Oxide.Hurtworld/releases/latest | jq -r '.assets[].browser_download_url')
 oxidehurtworldlatestlink=$(curl --connect-timeout 10 -sL https://api.github.com/repos/OxideMod/Oxide.Hurtworld/releases/latest | jq -r '.assets[].browser_download_url')
 oxidesdtdlatestlink=$(curl --connect-timeout 10 -sL https://api.github.com/repos/OxideMod/Oxide.SevenDaysToDie/releases/latest | jq -r '.assets[]|select(.browser_download_url | contains("linux")) | .browser_download_url' )
 oxidesdtdlatestlink=$(curl --connect-timeout 10 -sL https://api.github.com/repos/OxideMod/Oxide.SevenDaysToDie/releases/latest | jq -r '.assets[]|select(.browser_download_url | contains("linux")) | .browser_download_url' )
+# Valheim Plus
+valeimpluslatestlink=$(curl --connect-timeout 10 -sL https://api.github.com/repos/valheimPlus/ValheimPlus/releases/latest | jq -r '.assets[]|select(.browser_download_url | contains("UnixServer.tar.gz")) | .browser_download_url')
 
 
 # Define mods information (required)
 # Define mods information (required)
 
 
@@ -138,7 +143,11 @@ mod_info_stripper=( MOD "stripper" "Stripper Source" "http://www.bailopan.net/st
 mod_info_gokz=( MOD "gokz" "GOKZ" "https://bitbucket.org/kztimerglobalteam/gokz/downloads/GOKZ-latest.zip" "gokz-latest.zip" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "ENGINES" "Counter-Strike: Global Offensive;" "NOTGAMES" "https://bitbucket.org/kztimerglobalteam/gokz/src/master/" "Implements the KZ game mode (requires SourceMod and MetaMod)" )
 mod_info_gokz=( MOD "gokz" "GOKZ" "https://bitbucket.org/kztimerglobalteam/gokz/downloads/GOKZ-latest.zip" "gokz-latest.zip" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "ENGINES" "Counter-Strike: Global Offensive;" "NOTGAMES" "https://bitbucket.org/kztimerglobalteam/gokz/src/master/" "Implements the KZ game mode (requires SourceMod and MetaMod)" )
 mod_info_ttt=( MOD "ttt" "Trouble in Terrorist Town" "https://csgottt.com/downloads/ttt-latest-dev-${sourcemodversion}.zip" "ttt-latest.zip" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "ENGINES" "Counter-Strike: Global Offensive;" "NOTGAMES" "https://github.com/Bara/TroubleinTerroristTown" "Implements the TTT game mode (requires SourceMod and MetaMod)" )
 mod_info_ttt=( MOD "ttt" "Trouble in Terrorist Town" "https://csgottt.com/downloads/ttt-latest-dev-${sourcemodversion}.zip" "ttt-latest.zip" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "ENGINES" "Counter-Strike: Global Offensive;" "NOTGAMES" "https://github.com/Bara/TroubleinTerroristTown" "Implements the TTT game mode (requires SourceMod and MetaMod)" )
 mod_info_get5=( MOD "get5" "Get 5" "${get5url}" "${get5latestfile}" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "ENGINES" "Counter-Strike: Global Offensive;" "NOTGAMES" "https://github.com/splewis/get5" "Plugin for competitive matches/scrims (requires SourceMod and MetaMod)" )
 mod_info_get5=( MOD "get5" "Get 5" "${get5url}" "${get5latestfile}" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "ENGINES" "Counter-Strike: Global Offensive;" "NOTGAMES" "https://github.com/splewis/get5" "Plugin for competitive matches/scrims (requires SourceMod and MetaMod)" )
+mod_info_prac=( MOD "prac" "csgo practice mode" "${csgopracticelatestlink}" "${csgopracticelatestfile}" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "ENGINES" "Counter-Strike: Global Offensive;" "NOTGAMES" "https://github.com/splewis/csgo-practice-mode" "Practice Mode is a sourcemod plugin for helping players/teams run practices." )
 mod_info_pug=( MOD "pug" "PUG" "${csgopuglatestlink}" "${csgopuglatestfile}" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "ENGINES" "Counter-Strike: Global Offensive;" "NOTGAMES" "https://github.com/splewis/csgo-pug-setup" "plugin for setting up private pug/10man games" )
 mod_info_pug=( MOD "pug" "PUG" "${csgopuglatestlink}" "${csgopuglatestfile}" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "ENGINES" "Counter-Strike: Global Offensive;" "NOTGAMES" "https://github.com/splewis/csgo-pug-setup" "plugin for setting up private pug/10man games" )
+mod_info_dhook=( MOD "dhook" "dhook" "https://forums.alliedmods.net/attachment.php?attachmentid=190123&d=1625050030" "dhooks-2.2.0d17.zip" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "ENGINES" "Counter-Strike: Global Offensive;" "NOTGAMES" "https://forums.alliedmods.net/showpost.php?p=2588686&postcount=589" "DHooks 2.2.0 - Required for GOKZ" )
+mod_info_movement=( MOD "movementapi" "movementapi" "https://github.com/danzayau/MovementAPI/releases/download/2.1.0/MovementAPI-v2.1.0.zip" "MovementAPI-v2.1.0.zip" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "ENGINES" "Counter-Strike: Global Offensive;" "NOTGAMES" "https://github.com/danzayau/MovementAPI" "Movement API 2.1.0 - Required for GOKZ" )
+mod_info_cleaner=( MOD "cleaner" "cleaner" "https://github.com/e54385991/console-cleaner/archive/refs/heads/master.zip" "console-cleaner.zip" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "ENGINES" "Counter-Strike: Global Offensive;" "NOTGAMES" "https://github.com/e54385991/console-cleaner" "Console Cleaner - Optional for GOKZ" )
 
 
 # Garry's Mod Addons
 # Garry's Mod Addons
 mod_info_ulib=( MOD "ulib" "ULib" "https://codeload.github.com/TeamUlysses/ulib/zip/master" "ulib-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://ulyssesmod.net" "Complete Framework" )
 mod_info_ulib=( MOD "ulib" "ULib" "https://codeload.github.com/TeamUlysses/ulib/zip/master" "ulib-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://ulyssesmod.net" "Complete Framework" )
@@ -147,17 +156,36 @@ mod_info_utime=( MOD "utime" "UTime" "https://github.com/TeamUlysses/utime/archi
 mod_info_uclip=( MOD "uclip" "UClip" "https://github.com/TeamUlysses/uclip/archive/master.zip" "uclip-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://ulyssesmod.net" "An alternative to noclip" )
 mod_info_uclip=( MOD "uclip" "UClip" "https://github.com/TeamUlysses/uclip/archive/master.zip" "uclip-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://ulyssesmod.net" "An alternative to noclip" )
 mod_info_acf=( MOD "acf" "Armoured Combat Framework" "https://github.com/nrlulz/ACF/archive/master.zip" "acf-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "acf-master/lua/acf/shared/guns;" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/nrlulz/ACF" "Realistic Wepons & Engines" )
 mod_info_acf=( MOD "acf" "Armoured Combat Framework" "https://github.com/nrlulz/ACF/archive/master.zip" "acf-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "acf-master/lua/acf/shared/guns;" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/nrlulz/ACF" "Realistic Wepons & Engines" )
 mod_info_acf_missiles=( MOD "acfmissiles" "ACF Missiles" "https://github.com/Bubbus/ACF-Missiles/archive/master.zip" "acf-missiles-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/Bubbus/ACF-Missiles" "More missiles for ACF" )
 mod_info_acf_missiles=( MOD "acfmissiles" "ACF Missiles" "https://github.com/Bubbus/ACF-Missiles/archive/master.zip" "acf-missiles-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/Bubbus/ACF-Missiles" "More missiles for ACF" )
-mod_info_advdupe2=( MOD "advdupe2" "Advanced Duplicator 2" "https://github.com/wiremod/advdupe2/archive/master.zip" "advdupe2-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://www.wiremod.com" "Save your constructions" )
+mod_info_advdupe2=( MOD "advdupe2" "Advanced Duplicator 2" "https://github.com/wiremod/advdupe2/archive/master.zip" "advdupe2-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://www.wiremod.com" "Save your constructions. Second version" )
 mod_info_pac3=( MOD "pac3" "PAC3" "https://github.com/CapsAdmin/pac3/archive/master.zip" "pac3-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/CapsAdmin/pac3" "Advanced player model customization" )
 mod_info_pac3=( MOD "pac3" "PAC3" "https://github.com/CapsAdmin/pac3/archive/master.zip" "pac3-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/CapsAdmin/pac3" "Advanced player model customization" )
 mod_info_wiremod=( MOD "wiremod" "Wiremod" "https://github.com/wiremod/wire/archive/master.zip" "wire-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/wiremod/wire" "Base Wiremod Addon")
 mod_info_wiremod=( MOD "wiremod" "Wiremod" "https://github.com/wiremod/wire/archive/master.zip" "wire-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/wiremod/wire" "Base Wiremod Addon")
 mod_info_wiremodextras=( MOD "wiremod-extras" "Wiremod Extras" "https://github.com/wiremod/wire-extras/archive/master.zip" "wire-extras-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/wiremod/wire-extras/" "Addition to Wiremod, Extra Content")
 mod_info_wiremodextras=( MOD "wiremod-extras" "Wiremod Extras" "https://github.com/wiremod/wire-extras/archive/master.zip" "wire-extras-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/wiremod/wire-extras/" "Addition to Wiremod, Extra Content")
+mod_info_advduplicator=( MOD "advdupe1" "Advanced Duplicator 1" "https://github.com/wiremod/advduplicator/archive/master.zip" "advduplicator-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/wiremod/advduplicator" "Save your constructions. First version" )
+mod_info_trackassemblytool=( MOD "trackassemblytool" "Track Assembly Tool" "https://github.com/dvdvideo1234/trackassemblytool/archive/master.zip" "trackassemblytool-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/dvdvideo1234/TrackAssemblyTool" "Assembles segmented track. Supports wire" )
+mod_info_physpropertiesadv=( MOD "physpropertiesadv" "Phys Properties Adv" "https://github.com/dvdvideo1234/physpropertiesadv/archive/master.zip" "physpropertiesadv-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/dvdvideo1234/PhysPropertiesAdv" "Advanced configurable properties" )
+mod_info_controlsystemse2=( MOD "controlsystemse2" "Control Systems E2" "https://github.com/dvdvideo1234/controlsystemse2/archive/master.zip" "controlsystemse2-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/dvdvideo1234/ControlSystemsE2" "PID controllers and fast traces for E2. Minor included in wire-extas" )
+mod_info_e2pistontiming=( MOD "e2pistontiming" "E2 Piston Timing" "https://github.com/dvdvideo1234/e2pistontiming/archive/master.zip" "e2pistontiming-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/dvdvideo1234/E2PistonTiming" "Routine driven piston engine timings for E2" )
+mod_info_propcannontool=( MOD "propcannontool" "Prop Cannon Tool" "https://github.com/dvdvideo1234/propcannontool/archive/master.zip" "propcannontool-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/dvdvideo1234/PropCannonTool" "Cannon entity that can fire props. Supports wire" )
+mod_info_gearassemblytool=( MOD "gearassemblytool" "Gear Assembly Tool" "https://github.com/dvdvideo1234/gearassemblytool/archive/master.zip" "gearassemblytool-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/dvdvideo1234/GearAssemblyTool" "Assembles segmented gearbox" )
+mod_info_spinnertool=( MOD "spinnertool" "Spinner Tool" "https://github.com/dvdvideo1234/spinnertool/archive/master.zip" "spinnertool-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/dvdvideo1234/SpinnerTool" "Torque lever controlled spinner. Supports wire" )
+mod_info_surfacefrictiontool=( MOD "surfacefrictiontool" "Surface Friction Tool" "https://github.com/dvdvideo1234/surfacefrictiontool/archive/master.zip" "surfacefrictiontool-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/dvdvideo1234/SurfaceFrictionTool" "Controls the surface friction of a prop" )
+mod_info_magneticdipole=( MOD "magneticdipole" "Magnetic Dipole" "https://github.com/dvdvideo1234/magneticdipole/archive/master.zip" "magneticdipole-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/dvdvideo1234/MagneticDipole" "Magnet entity that runs forces on its poles. Supports wire" )
+mod_info_environmentorganizer=( MOD "environmentorganizer" "Environment Organizer" "https://github.com/dvdvideo1234/environmentorganizer/archive/master.zip" "environmentorganizer-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/dvdvideo1234/EnvironmentOrganizer" "Installs routines designed for server settings adjustment" )
+mod_info_precision_alignment=( MOD "precision-alignment" "Precision Alignment" "https://github.com/Mista-Tea/precision-alignment/archive/master.zip" "precision-alignment-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/Mista-Tea/precision-alignment" "Creates precise constraints and aligments" )
+mod_info_improved_stacker=( MOD "improved-stacker" "Improved Stacker" "https://github.com/Mista-Tea/improved-stacker/archive/master.zip" "improved-stacker-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/Mista-Tea/improved-stacker" "Stacks entities in the direction chosen" )
+mod_info_improved_weight=( MOD "improved-weight" "Improved Weight" "https://github.com/Mista-Tea/improved-weight/archive/master.zip" "improved-weight-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/Mista-Tea/improved-weight" "Weight tool but with more features" )
+mod_info_improved_antinoclip=( MOD "improved-antinoclip" "Improved Antinoclip" "https://github.com/Mista-Tea/improved-antinoclip/archive/master.zip" "improved-antinoclip-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/Mista-Tea/improved-antinoclip" "Controls clipping trough an object" )
 mod_info_darkrp=( MOD "darkrp" "DarkRP" "https://github.com/FPtje/DarkRP/archive/master.zip" "darkrp-master.zip" "0" "LowercaseOn" "${systemdir}/gamemodes" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://darkrp.com" "Most popular gamemode" )
 mod_info_darkrp=( MOD "darkrp" "DarkRP" "https://github.com/FPtje/DarkRP/archive/master.zip" "darkrp-master.zip" "0" "LowercaseOn" "${systemdir}/gamemodes" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://darkrp.com" "Most popular gamemode" )
 mod_info_darkrpmodification=( MOD "darkrpmodification" "DarkRP Modification" "https://github.com/FPtje/darkrpmodification/archive/master.zip" "darkrpmodification-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "NOUPDATE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://darkrp.com" "Customize DarkRP settings" )
 mod_info_darkrpmodification=( MOD "darkrpmodification" "DarkRP Modification" "https://github.com/FPtje/darkrpmodification/archive/master.zip" "darkrpmodification-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "NOUPDATE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://darkrp.com" "Customize DarkRP settings" )
+mod_info_laserstool=( MOD "laserstool" "Laser STool" "https://github.com/dvdvideo1234/laserstool/archive/main.zip" "laserstool-main.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/dvdvideo1234/LaserSTool" "Scripted tool that spawns laser entities, simulates light rays and even kill players" )
 
 
 # Oxidemod
 # Oxidemod
 mod_info_rustoxide=( MOD "rustoxide" "Oxide for Rust" "${oxiderustlatestlink}" "Oxide.Rust-linux.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Rust;" "NOTGAMES" "https://umod.org/games/rust" "Allows for the use of plugins" )
 mod_info_rustoxide=( MOD "rustoxide" "Oxide for Rust" "${oxiderustlatestlink}" "Oxide.Rust-linux.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Rust;" "NOTGAMES" "https://umod.org/games/rust" "Allows for the use of plugins" )
 mod_info_hwoxide=( MOD "hwoxide" "Oxide for Hurtworld" "${oxidehurtworldlatestlink}" "Oxide.Hurtworld.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Hurtworld;" "NOTGAMES" "https://umod.org/games/hurtworld" "Allows for the use of plugins" )
 mod_info_hwoxide=( MOD "hwoxide" "Oxide for Hurtworld" "${oxidehurtworldlatestlink}" "Oxide.Hurtworld.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Hurtworld;" "NOTGAMES" "https://umod.org/games/hurtworld" "Allows for the use of plugins" )
 mod_info_sdtdoxide=( MOD "sdtdoxide" "Oxide for 7 Days To Die" "${oxidesdtdlatestlink}" "Oxide.SevenDaysToDie.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "7 Days To Die;" "NOTGAMES" "https://umod.org/games/7-days-to-die" "Allows for the use of plugins" )
 mod_info_sdtdoxide=( MOD "sdtdoxide" "Oxide for 7 Days To Die" "${oxidesdtdlatestlink}" "Oxide.SevenDaysToDie.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "7 Days To Die;" "NOTGAMES" "https://umod.org/games/7-days-to-die" "Allows for the use of plugins" )
 
 
+# ValheimPlus
+mod_info_valheimplus=( MOD "valheimplus" "Valheim PLUS" "${valeimpluslatestlink}" "ValheimPlus.tar.gz" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Valheim;" "NOTGAMES" "https://github.com/valheimPlus/ValheimPlus" "Mod to improve Valheim gameplay")
+
 # REQUIRED: Set all mods info into the global array
 # REQUIRED: Set all mods info into the global array
-mods_global_array=( "${mod_info_metamod[@]}" "${mod_info_base_amxx[@]}" "${mod_info_cs_amxx[@]}" "${mod_info_dod_amxx[@]}" "${mod_info_tfc_amxx[@]}" "${mod_info_ns_amxx[@]}" "${mod_info_ts_amxx[@]}" "${mod_info_metamodsource[@]}" "${mod_info_sourcemod[@]}" "${mod_info_steamworks[@]}" "${mod_info_gokz[@]}" "${mod_info_ttt[@]}" "${mod_info_get5[@]}" "${mod_info_pug[@]}" "${mod_info_ulib[@]}" "${mod_info_ulx[@]}" "${mod_info_utime[@]}" "${mod_info_uclip[@]}" "${mod_info_acf[@]}" "${mod_info_acf_missiles[@]}" "${mod_info_acf_sweps[@]}" "${mod_info_advdupe2[@]}" "${mod_info_pac3[@]}" "${mod_info_wiremod[@]}" "${mod_info_wiremodextras[@]}" "${mod_info_darkrp[@]}" "${mod_info_darkrpmodification[@]}" "${mod_info_rustoxide[@]}" "${mod_info_hwoxide[@]}" "${mod_info_sdtdoxide[@]}" )
+mods_global_array=( "${mod_info_metamod[@]}" "${mod_info_base_amxx[@]}" "${mod_info_cs_amxx[@]}" "${mod_info_dod_amxx[@]}" "${mod_info_tfc_amxx[@]}" "${mod_info_ns_amxx[@]}" "${mod_info_ts_amxx[@]}" "${mod_info_metamodsource[@]}" "${mod_info_sourcemod[@]}" "${mod_info_steamworks[@]}" "${mod_info_gokz[@]}" "${mod_info_ttt[@]}" "${mod_info_get5[@]}" "${mod_info_prac[@]}" "${mod_info_pug[@]}" "${mod_info_dhook[@]}" "${mod_info_movement[@]}" "${mod_info_cleaner[@]}" "${mod_info_ulib[@]}" "${mod_info_ulx[@]}" "${mod_info_utime[@]}" "${mod_info_uclip[@]}" "${mod_info_acf[@]}" "${mod_info_acf_missiles[@]}" "${mod_info_acf_sweps[@]}" "${mod_info_advdupe2[@]}" "${mod_info_pac3[@]}" "${mod_info_wiremod[@]}" "${mod_info_wiremodextras[@]}" "${mod_info_darkrp[@]}" "${mod_info_darkrpmodification[@]}" "${mod_info_rustoxide[@]}" "${mod_info_hwoxide[@]}" "${mod_info_sdtdoxide[@]}" "${mod_info_advduplicator[@]}" "${mod_info_trackassemblytool[@]}" "${mod_info_physpropertiesadv[@]}" "${mod_info_controlsystemse2[@]}" "${mod_info_e2pistontiming[@]}" "${mod_info_propcannontool[@]}" "${mod_info_gearassemblytool[@]}" "${mod_info_spinnertool[@]}" "${mod_info_surfacefrictiontool[@]}" "${mod_info_magneticdipole[@]}" "${mod_info_environmentorganizer[@]}" "${mod_info_precision_alignment[@]}" "${mod_info_improved_stacker[@]}" "${mod_info_improved_weight[@]}" "${mod_info_improved_antinoclip[@]}" "${mod_info_laserstool[@]}" "${mod_info_valheimplus[@]}" )

+ 1 - 1
linuxgsm.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 	set -x
 fi
 fi
 
 
-version="v21.2.5"
+version="v21.3.2"
 shortname="core"
 shortname="core"
 gameservername="core"
 gameservername="core"
 commandname="CORE"
 commandname="CORE"

+ 1 - 1
tests/tests_fctrserver.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 	set -x
 fi
 fi
 
 
-version="v21.2.5"
+version="v21.3.2"
 shortname="fctr"
 shortname="fctr"
 gameservername="fctrserver"
 gameservername="fctrserver"
 commandname="CORE"
 commandname="CORE"

+ 4 - 4
tests/tests_jc2server.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 	set -x
 fi
 fi
 
 
-version="v21.2.5"
+version="v21.3.2"
 shortname="jc2"
 shortname="jc2"
 gameservername="jc2server"
 gameservername="jc2server"
 commandname="CORE"
 commandname="CORE"
@@ -1070,10 +1070,10 @@ echo -e "================================="
 echo -e "Description:"
 echo -e "Description:"
 echo -e "Inserting Travis IP in to config."
 echo -e "Inserting Travis IP in to config."
 echo -e "Allows monitor to work"
 echo -e "Allows monitor to work"
-if [ "$(ip -o -4 addr|grep eth0)" ]; then
-	travisip=$(ip -o -4 addr | grep eth0 | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | grep -v 127.0.0)
+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
 else
-	travisip=$(ip -o -4 addr | grep ens | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | sort -u | grep -v 127.0.0)
+	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
 fi
 sed -i "/BindIP/c\BindIP                      = \"${travisip}\"," "${serverfiles}/config.lua"
 sed -i "/BindIP/c\BindIP                      = \"${travisip}\"," "${serverfiles}/config.lua"
 echo -e "IP: ${travisip}"
 echo -e "IP: ${travisip}"

+ 7 - 7
tests/tests_mcserver.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 	set -x
 fi
 fi
 
 
-version="v21.2.5"
+version="v21.3.2"
 shortname="mc"
 shortname="mc"
 gameservername="mcserver"
 gameservername="mcserver"
 commandname="CORE"
 commandname="CORE"
@@ -933,10 +933,10 @@ echo -e "================================="
 echo -e "Description:"
 echo -e "Description:"
 echo -e "Inserting Travis IP in to config."
 echo -e "Inserting Travis IP in to config."
 echo -e "Allows monitor to work"
 echo -e "Allows monitor to work"
-if [ "$(ip -o -4 addr|grep eth0)" ]; then
-	travisip=$(ip -o -4 addr | grep eth0 | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | grep -v 127.0.0)
+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
 else
-	travisip=$(ip -o -4 addr | grep ens | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | sort -u | grep -v 127.0.0)
+	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
 fi
 sed -i "/server-ip=/c\server-ip=${travisip}" "${serverfiles}/server.properties"
 sed -i "/server-ip=/c\server-ip=${travisip}" "${serverfiles}/server.properties"
 echo -e "IP: ${travisip}"
 echo -e "IP: ${travisip}"
@@ -1167,10 +1167,10 @@ echo -e "================================="
 echo -e "Description:"
 echo -e "Description:"
 echo -e "Inserting Travis IP in to config."
 echo -e "Inserting Travis IP in to config."
 echo -e "Allows monitor to work"
 echo -e "Allows monitor to work"
-if [ "$(ip -o -4 addr|grep eth0)" ]; then
-	travisip=$(ip -o -4 addr | grep eth0 | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | grep -v 127.0.0)
+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
 else
-	travisip=$(ip -o -4 addr | grep ens | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | sort -u | grep -v 127.0.0)
+	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
 fi
 sed -i "/server-ip=/c\server-ip=${travisip}" "${serverfiles}/server.properties"
 sed -i "/server-ip=/c\server-ip=${travisip}" "${serverfiles}/server.properties"
 echo -e "IP: ${travisip}"
 echo -e "IP: ${travisip}"

+ 1 - 1
tests/tests_ts3server.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 	set -x
 fi
 fi
 
 
-version="v21.2.5"
+version="v21.3.2"
 shortname="ts3"
 shortname="ts3"
 gameservername="ts3server"
 gameservername="ts3server"
 commandname="CORE"
 commandname="CORE"

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels