From 20cf26b66c536cffc25118d3d7793ce3b03bb6df Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 19 May 2023 12:53:51 +0100
Subject: [PATCH 01/16] server list validate

---
 .github/workflows/serverlist-validate.sh  | 19 +++++++++++++++++++
 .github/workflows/serverlist-validate.yml | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100755 .github/workflows/serverlist-validate.sh
 create mode 100644 .github/workflows/serverlist-validate.yml

diff --git a/.github/workflows/serverlist-validate.sh b/.github/workflows/serverlist-validate.sh
new file mode 100755
index 0000000000..112cf942aa
--- /dev/null
+++ b/.github/workflows/serverlist-validate.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+echo "Checking that all the game servers are listed in all csv files"
+echo "this check will ensure serverlist.csv has the same number of lines (-2 lines) as the other csv files"
+# count the number of lines in the serverlist.csv
+cd ../../lgsm/data/
+serverlistcount="$(wc -l < serverlist.csv)"
+echo "serverlistcount: $serverlistcount"
+# get list of all csv files starting with ubunutu debian centos
+csvlist="$(ls -1 | grep -E '^(ubuntu|debian|centos|rhel|almalinux|rocky).*\.csv$')"
+# loop though each csv file and make sure the number of lines is the same as the serverlistcount
+for csv in $csvlist; do
+	csvcount="$(wc -l < $csv)"
+	csvcount=$((csvcount-2))
+	if [ "$csvcount" -ne "$serverlistcount" ]; then
+		echo "ERROR: $csv ($csvcount) does not match serverlist.csv ($serverlistcount)"
+	else
+		echo "OK: $csv ($csvcount) and serverlist.csv ($serverlistcount) match"
+	fi
+done
diff --git a/.github/workflows/serverlist-validate.yml b/.github/workflows/serverlist-validate.yml
new file mode 100644
index 0000000000..1333b1bfba
--- /dev/null
+++ b/.github/workflows/serverlist-validate.yml
@@ -0,0 +1,19 @@
+name: Server list Validation
+on:
+  workflow_dispatch:
+  push:
+
+jobs:
+  # This workflow contains a single job called "build"
+  Version-Check:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v3
+
+      # Runs a single command using the runners shell
+      - name: compare versions
+        run: chmod +x .github/workflows/serverlist-validate.sh; .github/workflows/serverlist-validate.sh

From 48307c9264e5e902759b81b1bb17895c646f0977 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 19 May 2023 12:56:30 +0100
Subject: [PATCH 02/16] dir

---
 .github/workflows/serverlist-validate.sh  | 2 +-
 .github/workflows/serverlist-validate.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/serverlist-validate.sh b/.github/workflows/serverlist-validate.sh
index 112cf942aa..d881738ba4 100755
--- a/.github/workflows/serverlist-validate.sh
+++ b/.github/workflows/serverlist-validate.sh
@@ -2,7 +2,7 @@
 echo "Checking that all the game servers are listed in all csv files"
 echo "this check will ensure serverlist.csv has the same number of lines (-2 lines) as the other csv files"
 # count the number of lines in the serverlist.csv
-cd ../../lgsm/data/
+cd lgsm/modules
 serverlistcount="$(wc -l < serverlist.csv)"
 echo "serverlistcount: $serverlistcount"
 # get list of all csv files starting with ubunutu debian centos
diff --git a/.github/workflows/serverlist-validate.yml b/.github/workflows/serverlist-validate.yml
index 1333b1bfba..d4dbe31e6f 100644
--- a/.github/workflows/serverlist-validate.yml
+++ b/.github/workflows/serverlist-validate.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   # This workflow contains a single job called "build"
-  Version-Check:
+  serverlist-validate:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 

From 7db3b158e046e6cb6d9f3a0262257039b5cc54fb Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 19 May 2023 12:58:40 +0100
Subject: [PATCH 03/16] dir

---
 .github/workflows/serverlist-validate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/serverlist-validate.sh b/.github/workflows/serverlist-validate.sh
index d881738ba4..194a1b08e9 100755
--- a/.github/workflows/serverlist-validate.sh
+++ b/.github/workflows/serverlist-validate.sh
@@ -3,7 +3,7 @@ echo "Checking that all the game servers are listed in all csv files"
 echo "this check will ensure serverlist.csv has the same number of lines (-2 lines) as the other csv files"
 # count the number of lines in the serverlist.csv
 cd lgsm/modules
-serverlistcount="$(wc -l < serverlist.csv)"
+serverlistcount="$(wc -l < lgsm/modules/serverlist.csv)"
 echo "serverlistcount: $serverlistcount"
 # get list of all csv files starting with ubunutu debian centos
 csvlist="$(ls -1 | grep -E '^(ubuntu|debian|centos|rhel|almalinux|rocky).*\.csv$')"

From 027bc2003b58d4df849258bc5f09119b4613f7aa Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 19 May 2023 13:00:57 +0100
Subject: [PATCH 04/16] dir

---
 .github/workflows/serverlist-validate.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/serverlist-validate.sh b/.github/workflows/serverlist-validate.sh
index 194a1b08e9..2bc68705bb 100755
--- a/.github/workflows/serverlist-validate.sh
+++ b/.github/workflows/serverlist-validate.sh
@@ -2,8 +2,8 @@
 echo "Checking that all the game servers are listed in all csv files"
 echo "this check will ensure serverlist.csv has the same number of lines (-2 lines) as the other csv files"
 # count the number of lines in the serverlist.csv
-cd lgsm/modules
-serverlistcount="$(wc -l < lgsm/modules/serverlist.csv)"
+cd lgsm/data
+serverlistcount="$(wc -l < serverlist.csv)"
 echo "serverlistcount: $serverlistcount"
 # get list of all csv files starting with ubunutu debian centos
 csvlist="$(ls -1 | grep -E '^(ubuntu|debian|centos|rhel|almalinux|rocky).*\.csv$')"

From 11064ae6524da5e222ca52ff2f627c7108c7dd2e Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 19 May 2023 13:03:12 +0100
Subject: [PATCH 05/16] cr

---
 lgsm/data/serverlist.csv | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv
index 2bce540865..60d0dc8934 100644
--- a/lgsm/data/serverlist.csv
+++ b/lgsm/data/serverlist.csv
@@ -128,4 +128,3 @@ wmc,wmcserver,WaterfallMC,ubuntu-22.04
 wurm,wurmserver,Wurm Unlimited,ubuntu-22.04
 zmr,zmrserver,Zombie Master: Reborn,ubuntu-22.04
 zps,zpsserver,Zombie Panic! Source,ubuntu-22.04
-

From ea6092478283a4d98e3b3c898ed8e663f36736aa Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 19 May 2023 13:07:46 +0100
Subject: [PATCH 06/16] add missing pc2

---
 lgsm/data/almalinux-9.csv  | 1 +
 lgsm/data/centos-7.csv     | 1 +
 lgsm/data/centos-8.csv     | 1 +
 lgsm/data/centos-9.csv     | 1 +
 lgsm/data/debian-10.csv    | 1 +
 lgsm/data/debian-11.csv    | 1 +
 lgsm/data/debian-12.csv    | 1 +
 lgsm/data/debian-9.csv     | 1 +
 lgsm/data/rhel-7.csv       | 1 +
 lgsm/data/rhel-8.csv       | 1 +
 lgsm/data/rhel-9.csv       | 1 +
 lgsm/data/rocky-8.csv      | 1 +
 lgsm/data/rocky-9.csv      | 1 +
 lgsm/data/ubuntu-16.04.csv | 1 +
 lgsm/data/ubuntu-18.04.csv | 1 +
 lgsm/data/ubuntu-20.04.csv | 1 +
 lgsm/data/ubuntu-21.04.csv | 1 +
 lgsm/data/ubuntu-21.10.csv | 1 +
 lgsm/data/ubuntu-22.04.csv | 1 +
 19 files changed, 19 insertions(+)

diff --git a/lgsm/data/almalinux-9.csv b/lgsm/data/almalinux-9.csv
index 8d4b452164..eb72d965e1 100644
--- a/lgsm/data/almalinux-9.csv
+++ b/lgsm/data/almalinux-9.csv
@@ -78,6 +78,7 @@ ns2c,speex.i686,tbb.i686
 onset,mariadb-connector-c
 opfor
 pc
+pc2
 pmc,java-17-openjdk
 pstbs,GConf2
 pvkii
diff --git a/lgsm/data/centos-7.csv b/lgsm/data/centos-7.csv
index 0769c4ef8f..cd537127e6 100644
--- a/lgsm/data/centos-7.csv
+++ b/lgsm/data/centos-7.csv
@@ -78,6 +78,7 @@ ns2c,speex.i686,tbb.i686
 onset,mariadb-connector-c
 opfor
 pc
+pc2
 pmc,java-11-openjdk
 pstbs,GConf2
 pvkii
diff --git a/lgsm/data/centos-8.csv b/lgsm/data/centos-8.csv
index 8d4b452164..eb72d965e1 100644
--- a/lgsm/data/centos-8.csv
+++ b/lgsm/data/centos-8.csv
@@ -78,6 +78,7 @@ ns2c,speex.i686,tbb.i686
 onset,mariadb-connector-c
 opfor
 pc
+pc2
 pmc,java-17-openjdk
 pstbs,GConf2
 pvkii
diff --git a/lgsm/data/centos-9.csv b/lgsm/data/centos-9.csv
index 8d4b452164..eb72d965e1 100644
--- a/lgsm/data/centos-9.csv
+++ b/lgsm/data/centos-9.csv
@@ -78,6 +78,7 @@ ns2c,speex.i686,tbb.i686
 onset,mariadb-connector-c
 opfor
 pc
+pc2
 pmc,java-17-openjdk
 pstbs,GConf2
 pvkii
diff --git a/lgsm/data/debian-10.csv b/lgsm/data/debian-10.csv
index 7058cc97ee..eca6122293 100644
--- a/lgsm/data/debian-10.csv
+++ b/lgsm/data/debian-10.csv
@@ -78,6 +78,7 @@ ns2c,speex:i386,libtbb2
 onset,libmariadb-dev
 opfor
 pc
+pc2
 pmc,openjdk-11-jre
 pstbs,libgconf-2-4
 pvkii
diff --git a/lgsm/data/debian-11.csv b/lgsm/data/debian-11.csv
index ff8c8ae761..0eecc40fd1 100644
--- a/lgsm/data/debian-11.csv
+++ b/lgsm/data/debian-11.csv
@@ -78,6 +78,7 @@ ns2c,speex:i386,libtbb2
 onset,libmariadb-dev
 opfor
 pc
+pc2
 pmc,openjdk-17-jre
 pstbs,libgconf-2-4
 pvkii
diff --git a/lgsm/data/debian-12.csv b/lgsm/data/debian-12.csv
index 3f3e0aed1e..2bd92c32df 100644
--- a/lgsm/data/debian-12.csv
+++ b/lgsm/data/debian-12.csv
@@ -78,6 +78,7 @@ ns2c,speex:i386,libtbb12
 onset,libmariadb-dev
 opfor
 pc
+pc2
 pmc,openjdk-17-jre
 pstbs,libgconf-2-4
 pvkii
diff --git a/lgsm/data/debian-9.csv b/lgsm/data/debian-9.csv
index 507896a6ad..8a4fd6df43 100644
--- a/lgsm/data/debian-9.csv
+++ b/lgsm/data/debian-9.csv
@@ -78,6 +78,7 @@ ns2c,speex:i386,libtbb2
 onset,libmariadb-dev
 opfor
 pc
+pc2
 pmc,openjdk-8-jre
 pstbs,libgconf-2-4
 pvkii
diff --git a/lgsm/data/rhel-7.csv b/lgsm/data/rhel-7.csv
index c0b3f78043..dbf578bb9a 100644
--- a/lgsm/data/rhel-7.csv
+++ b/lgsm/data/rhel-7.csv
@@ -78,6 +78,7 @@ ns2c,speex.i686,tbb.i686
 onset,mariadb-connector-c
 opfor
 pc
+pc2
 pmc,java-11-openjdk
 pstbs,GConf2
 pvkii
diff --git a/lgsm/data/rhel-8.csv b/lgsm/data/rhel-8.csv
index 8d4b452164..eb72d965e1 100644
--- a/lgsm/data/rhel-8.csv
+++ b/lgsm/data/rhel-8.csv
@@ -78,6 +78,7 @@ ns2c,speex.i686,tbb.i686
 onset,mariadb-connector-c
 opfor
 pc
+pc2
 pmc,java-17-openjdk
 pstbs,GConf2
 pvkii
diff --git a/lgsm/data/rhel-9.csv b/lgsm/data/rhel-9.csv
index 8d4b452164..eb72d965e1 100644
--- a/lgsm/data/rhel-9.csv
+++ b/lgsm/data/rhel-9.csv
@@ -78,6 +78,7 @@ ns2c,speex.i686,tbb.i686
 onset,mariadb-connector-c
 opfor
 pc
+pc2
 pmc,java-17-openjdk
 pstbs,GConf2
 pvkii
diff --git a/lgsm/data/rocky-8.csv b/lgsm/data/rocky-8.csv
index 8d4b452164..eb72d965e1 100644
--- a/lgsm/data/rocky-8.csv
+++ b/lgsm/data/rocky-8.csv
@@ -78,6 +78,7 @@ ns2c,speex.i686,tbb.i686
 onset,mariadb-connector-c
 opfor
 pc
+pc2
 pmc,java-17-openjdk
 pstbs,GConf2
 pvkii
diff --git a/lgsm/data/rocky-9.csv b/lgsm/data/rocky-9.csv
index 8d4b452164..eb72d965e1 100644
--- a/lgsm/data/rocky-9.csv
+++ b/lgsm/data/rocky-9.csv
@@ -78,6 +78,7 @@ ns2c,speex.i686,tbb.i686
 onset,mariadb-connector-c
 opfor
 pc
+pc2
 pmc,java-17-openjdk
 pstbs,GConf2
 pvkii
diff --git a/lgsm/data/ubuntu-16.04.csv b/lgsm/data/ubuntu-16.04.csv
index 2b152ffef6..387a862d9e 100644
--- a/lgsm/data/ubuntu-16.04.csv
+++ b/lgsm/data/ubuntu-16.04.csv
@@ -78,6 +78,7 @@ ns2c,speex:i386,libtbb2
 onset,libmariadb-dev
 opfor
 pc
+pc2
 pmc,openjdk-8-jre
 pstbs,libgconf-2-4
 pvkii
diff --git a/lgsm/data/ubuntu-18.04.csv b/lgsm/data/ubuntu-18.04.csv
index 7058cc97ee..eca6122293 100644
--- a/lgsm/data/ubuntu-18.04.csv
+++ b/lgsm/data/ubuntu-18.04.csv
@@ -78,6 +78,7 @@ ns2c,speex:i386,libtbb2
 onset,libmariadb-dev
 opfor
 pc
+pc2
 pmc,openjdk-11-jre
 pstbs,libgconf-2-4
 pvkii
diff --git a/lgsm/data/ubuntu-20.04.csv b/lgsm/data/ubuntu-20.04.csv
index 764812a71c..a07d23a0b7 100644
--- a/lgsm/data/ubuntu-20.04.csv
+++ b/lgsm/data/ubuntu-20.04.csv
@@ -78,6 +78,7 @@ ns2c,speex:i386,libtbb2
 onset,libmariadb-dev
 opfor
 pc
+pc2
 pmc,openjdk-17-jre
 pstbs,libgconf-2-4
 pvkii
diff --git a/lgsm/data/ubuntu-21.04.csv b/lgsm/data/ubuntu-21.04.csv
index ff8c8ae761..0eecc40fd1 100644
--- a/lgsm/data/ubuntu-21.04.csv
+++ b/lgsm/data/ubuntu-21.04.csv
@@ -78,6 +78,7 @@ ns2c,speex:i386,libtbb2
 onset,libmariadb-dev
 opfor
 pc
+pc2
 pmc,openjdk-17-jre
 pstbs,libgconf-2-4
 pvkii
diff --git a/lgsm/data/ubuntu-21.10.csv b/lgsm/data/ubuntu-21.10.csv
index ca9576ca03..763b9d4c2f 100644
--- a/lgsm/data/ubuntu-21.10.csv
+++ b/lgsm/data/ubuntu-21.10.csv
@@ -76,6 +76,7 @@ ns2c,speex:i386,libtbb2
 onset,libmariadb-dev
 opfor
 pc
+pc2
 pmc,openjdk-17-jre
 pstbs,libgconf-2-4
 pvkii
diff --git a/lgsm/data/ubuntu-22.04.csv b/lgsm/data/ubuntu-22.04.csv
index 50886ad29a..06190f47e1 100644
--- a/lgsm/data/ubuntu-22.04.csv
+++ b/lgsm/data/ubuntu-22.04.csv
@@ -78,6 +78,7 @@ ns2c,speex:i386,libtbb2
 onset,libmariadb-dev
 opfor
 pc
+pc2
 pmc,openjdk-17-jre
 pstbs,libgconf-2-4
 pvkii

From 17458bd33f22aa08f64ea2f768f7cf931c34682f Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 19 May 2023 13:08:32 +0100
Subject: [PATCH 07/16] pc2

---
 lgsm/data/almalinux-8.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lgsm/data/almalinux-8.csv b/lgsm/data/almalinux-8.csv
index 8d4b452164..eb72d965e1 100644
--- a/lgsm/data/almalinux-8.csv
+++ b/lgsm/data/almalinux-8.csv
@@ -78,6 +78,7 @@ ns2c,speex.i686,tbb.i686
 onset,mariadb-connector-c
 opfor
 pc
+pc2
 pmc,java-17-openjdk
 pstbs,GConf2
 pvkii

From 00317b130449830eb1620121ebd5b612d6828d70 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 19 May 2023 13:11:28 +0100
Subject: [PATCH 08/16] fix branch

---
 .github/workflows/details-check.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/details-check.yml b/.github/workflows/details-check.yml
index 0d1327682d..ca812d2299 100644
--- a/.github/workflows/details-check.yml
+++ b/.github/workflows/details-check.yml
@@ -35,13 +35,13 @@ jobs:
         run: sudo apt-get install libxml2-utils jq
 
       - name: Download linuxgsm.sh
-        run: wget https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/feature/info_game-refactor/linuxgsm.sh; chmod +x linuxgsm.sh
+        run: wget https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/feature/${GITHUB_REF#refs/heads/}/linuxgsm.sh; chmod +x linuxgsm.sh
 
       - name: Grab server
-        run: LGSM_GITHUBBRANCH="feature/info_game-refactor" ./linuxgsm.sh ${{ matrix.shortname }}server
+        run: LGSM_GITHUBBRANCH="feature/${GITHUB_REF#refs/heads/}" ./linuxgsm.sh ${{ matrix.shortname }}server
 
       - name: Enable developer mode
-        run: LGSM_GITHUBBRANCH="feature/info_game-refactor" ./${{ matrix.shortname }}server developer
+        run: LGSM_GITHUBBRANCH="feature/${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server developer
 
       - id: sets-servercfgname
         name: Generate servercfgname
@@ -68,7 +68,7 @@ jobs:
         run: grep "startparameters" lgsm/config-default/config-lgsm/${{ matrix.shortname }}server/_default.cfg
 
       - name: Detect details
-        run: LGSM_GITHUBBRANCH="feature/info_game-refactor" ./${{ matrix.shortname }}server detect-details
+        run: LGSM_GITHUBBRANCH="feature/${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server detect-details
 
       - name: Query Raw
-        run: LGSM_GITHUBBRANCH="feature/info_game-refactor" ./${{ matrix.shortname }}server query-raw
+        run: LGSM_GITHUBBRANCH="feature/${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server query-raw

From 6c1800fd872e43853b3502b594c55d3e844ebb1b Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 19 May 2023 13:15:26 +0100
Subject: [PATCH 09/16] exit code

---
 .github/workflows/serverlist-validate.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/serverlist-validate.sh b/.github/workflows/serverlist-validate.sh
index 2bc68705bb..5f40ac1b22 100755
--- a/.github/workflows/serverlist-validate.sh
+++ b/.github/workflows/serverlist-validate.sh
@@ -13,7 +13,10 @@ for csv in $csvlist; do
 	csvcount=$((csvcount-2))
 	if [ "$csvcount" -ne "$serverlistcount" ]; then
 		echo "ERROR: $csv ($csvcount) does not match serverlist.csv ($serverlistcount)"
+		exitcode=1
 	else
 		echo "OK: $csv ($csvcount) and serverlist.csv ($serverlistcount) match"
 	fi
 done
+
+exit ${exitcode}

From e304f9809cefaf243d932869c32ffab51fb2f014 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 19 May 2023 13:17:01 +0100
Subject: [PATCH 10/16] repo

---
 .github/workflows/details-check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/details-check.yml b/.github/workflows/details-check.yml
index ca812d2299..34a4a2c908 100644
--- a/.github/workflows/details-check.yml
+++ b/.github/workflows/details-check.yml
@@ -35,7 +35,7 @@ jobs:
         run: sudo apt-get install libxml2-utils jq
 
       - name: Download linuxgsm.sh
-        run: wget https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/feature/${GITHUB_REF#refs/heads/}/linuxgsm.sh; chmod +x linuxgsm.sh
+        run: wget https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${GITHUB_REF#refs/heads/}/linuxgsm.sh; chmod +x linuxgsm.sh
 
       - name: Grab server
         run: LGSM_GITHUBBRANCH="feature/${GITHUB_REF#refs/heads/}" ./linuxgsm.sh ${{ matrix.shortname }}server

From 556257b41dd8bc7c2454527e2382b640492ac98a Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 19 May 2023 13:19:23 +0100
Subject: [PATCH 11/16] branch

---
 .github/workflows/details-check.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/details-check.yml b/.github/workflows/details-check.yml
index 34a4a2c908..b268bd03d9 100644
--- a/.github/workflows/details-check.yml
+++ b/.github/workflows/details-check.yml
@@ -38,10 +38,10 @@ jobs:
         run: wget https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${GITHUB_REF#refs/heads/}/linuxgsm.sh; chmod +x linuxgsm.sh
 
       - name: Grab server
-        run: LGSM_GITHUBBRANCH="feature/${GITHUB_REF#refs/heads/}" ./linuxgsm.sh ${{ matrix.shortname }}server
+        run: LGSM_GITHUBBRANCH="${GITHUB_REF#refs/heads/}" ./linuxgsm.sh ${{ matrix.shortname }}server
 
       - name: Enable developer mode
-        run: LGSM_GITHUBBRANCH="feature/${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server developer
+        run: LGSM_GITHUBBRANCH="${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server developer
 
       - id: sets-servercfgname
         name: Generate servercfgname
@@ -68,7 +68,7 @@ jobs:
         run: grep "startparameters" lgsm/config-default/config-lgsm/${{ matrix.shortname }}server/_default.cfg
 
       - name: Detect details
-        run: LGSM_GITHUBBRANCH="feature/${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server detect-details
+        run: LGSM_GITHUBBRANCH="${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server detect-details
 
       - name: Query Raw
-        run: LGSM_GITHUBBRANCH="feature/${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server query-raw
+        run: LGSM_GITHUBBRANCH="${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server query-raw

From 3810f57109a55d9bd61b5ffa03440d7f1cc454f0 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 19 May 2023 13:24:08 +0100
Subject: [PATCH 12/16] fix csv

---
 lgsm/data/ubuntu-21.10.csv | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lgsm/data/ubuntu-21.10.csv b/lgsm/data/ubuntu-21.10.csv
index 763b9d4c2f..e1504baca4 100644
--- a/lgsm/data/ubuntu-21.10.csv
+++ b/lgsm/data/ubuntu-21.10.csv
@@ -16,10 +16,11 @@ bfv,libncurses5:i386,libstdc++5:i386
 bmdm,libncurses5:i386
 bo
 bs
-bt,libicu-dev
+bt,libicu-dev,dos2unix
 btl
 cc
 ck,xvfb
+cd
 cmw
 cod,libstdc++5:i386
 cod2,libstdc++5:i386
@@ -32,6 +33,7 @@ cscz
 csgo
 css,libtinfo5:i386
 dab
+dayz
 dmc
 dod
 dodr

From 068e6b76acca7e10e311fcd5137ca75a030678cc Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 19 May 2023 13:30:45 +0100
Subject: [PATCH 13/16] letter

---
 .github/workflows/version-check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml
index b2aac2f870..f2b843ee7b 100644
--- a/.github/workflows/version-check.yml
+++ b/.github/workflows/version-check.yml
@@ -12,7 +12,7 @@ permissions:
 
 jobs:
   # This workflow contains a single job called "build"
-  Version-Check:
+  version-Check:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 

From cec0af79bbd0ad1d75781cc31133d7551498c0a0 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 19 May 2023 13:32:07 +0100
Subject: [PATCH 14/16] tidy

---
 .github/workflows/serverlist-validate.yml |  6 ------
 .github/workflows/version-check.yml       | 11 -----------
 2 files changed, 17 deletions(-)

diff --git a/.github/workflows/serverlist-validate.yml b/.github/workflows/serverlist-validate.yml
index d4dbe31e6f..e12c0e95ce 100644
--- a/.github/workflows/serverlist-validate.yml
+++ b/.github/workflows/serverlist-validate.yml
@@ -4,16 +4,10 @@ on:
   push:
 
 jobs:
-  # This workflow contains a single job called "build"
   serverlist-validate:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
 
-      # Runs a single command using the runners shell
       - name: compare versions
         run: chmod +x .github/workflows/serverlist-validate.sh; .github/workflows/serverlist-validate.sh
diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml
index f2b843ee7b..a12b344209 100644
--- a/.github/workflows/version-check.yml
+++ b/.github/workflows/version-check.yml
@@ -1,26 +1,15 @@
-# This is a basic workflow to help you get started with Actions
-
 name: Version Check
 
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
 on: push
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 permissions:
   contents: read
 
 jobs:
-  # This workflow contains a single job called "build"
   version-Check:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
 
-      # Runs a single command using the runners shell
       - name: compare versions
         run: chmod +x .github/workflows/version-check.sh; .github/workflows/version-check.sh

From 0ddc00f07b6f6447fc8c467f44aff5a3fc09706d Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 19 May 2023 18:30:03 +0100
Subject: [PATCH 15/16] codacy

---
 .github/workflows/serverlist-validate.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/serverlist-validate.sh b/.github/workflows/serverlist-validate.sh
index 5f40ac1b22..d6041c15ab 100755
--- a/.github/workflows/serverlist-validate.sh
+++ b/.github/workflows/serverlist-validate.sh
@@ -2,14 +2,14 @@
 echo "Checking that all the game servers are listed in all csv files"
 echo "this check will ensure serverlist.csv has the same number of lines (-2 lines) as the other csv files"
 # count the number of lines in the serverlist.csv
-cd lgsm/data
+cd "lgsm/data" || exit
 serverlistcount="$(wc -l < serverlist.csv)"
 echo "serverlistcount: $serverlistcount"
 # get list of all csv files starting with ubunutu debian centos
 csvlist="$(ls -1 | grep -E '^(ubuntu|debian|centos|rhel|almalinux|rocky).*\.csv$')"
 # loop though each csv file and make sure the number of lines is the same as the serverlistcount
 for csv in $csvlist; do
-	csvcount="$(wc -l < $csv)"
+	csvcount="$(wc -l < "${csv}")"
 	csvcount=$((csvcount-2))
 	if [ "$csvcount" -ne "$serverlistcount" ]; then
 		echo "ERROR: $csv ($csvcount) does not match serverlist.csv ($serverlistcount)"
@@ -19,4 +19,4 @@ for csv in $csvlist; do
 	fi
 done
 
-exit ${exitcode}
+exit "${exitcode}"

From 5cd097c3df3cce403441a0f32e95fbe7e04a91ec Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 19 May 2023 18:34:01 +0100
Subject: [PATCH 16/16] exit code

---
 .github/workflows/serverlist-validate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/serverlist-validate.sh b/.github/workflows/serverlist-validate.sh
index d6041c15ab..b43e803e0d 100755
--- a/.github/workflows/serverlist-validate.sh
+++ b/.github/workflows/serverlist-validate.sh
@@ -19,4 +19,4 @@ for csv in $csvlist; do
 	fi
 done
 
-exit "${exitcode}"
+exit ${exitcode}