Skip to content

Commit b260be8

Browse files
dgibbs64dgibbs64
committed
Merge branch 'release/v23.6.0'
2 parents 11d8d1c + 78752dd commit b260be8

File tree

547 files changed

+2461
-28341
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

547 files changed

+2461
-28341
lines changed

‎.github/workflows/details-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ jobs:
5959
6060
- name: Download config
6161
run: |
62-
if [ -z "${{ steps.sets-servercfgname.outputs.servercfgname }}" ]; then
62+
if [ "${{ steps.sets-servercfgname.outputs.servercfgname }}" == "" ]; then
6363
echo "This game server has no config file."
6464
else
6565
curl -f -o config "https://raw.githubusercontent.com/GameServerManagers/Game-Server-Configs/main/${{ matrix.shortname }}/${{ steps.sets-servercfgname.outputs.servercfgname }}"
6666
fi
6767
- name: Display config
6868
run: |
69-
if [ -z "${{ steps.sets-servercfgname.outputs.servercfgname }}" ]; then
69+
if [ "${{ steps.sets-servercfgname.outputs.servercfgname }}" == "" ]; then
7070
echo "This game server has no config file."
7171
else
7272
cat config

‎.github/workflows/detals-check-generate-matrix.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
curl "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/master/lgsm/data/serverlist.csv" | grep -v '^[[:blank:]]*$' > serverlist.csv
3+
curl "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${GITHUB_REF#refs/heads/}/lgsm/data/serverlist.csv" | grep -v '^[[:blank:]]*$' > serverlist.csv
44

55
echo -n "{" > "shortnamearray.json"
66
echo -n "\"include\":[" >> "shortnamearray.json"

‎.github/workflows/serverlist-validate-game-icons.sh

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#!/bin/bash
2+
3+
cd "lgsm/data" || exit
4+
5+
echo ""
6+
echo "Checking that all the game servers listed in serverlist.csv have a shortname-icon.png file"
7+
for shortname in $(tail -n +2 serverlist.csv | cut -d ',' -f1); do
8+
# check if $shortname-icon.png exists
9+
if [ ! -f "gameicons/${shortname}-icon.png" ]; then
10+
echo "ERROR: gameicons/${shortname}-icon.png does not exist"
11+
exitcode=1
12+
else
13+
echo "OK: gameicons/${shortname}-icon.png exists"
14+
fi
15+
done
16+
17+
echo ""
18+
echo "Checking if an unexpected gameicon exists"
19+
for gameicon in $(ls -1 gameicons); do
20+
# check if $gameicon is in serverlist.csv
21+
if ! grep -q "${gameicon%-icon.png}" serverlist.csv; then
22+
echo "ERROR: gameicon ${gameicon} is not in serverlist.csv"
23+
exitcode=1
24+
else
25+
echo "OK: gameicon ${gameicon} is in serverlist.csv"
26+
fi
27+
done
28+
29+
echo ""
30+
echo "Checking that the number of gameicons matches the number of servers in serverlist.csv"
31+
gameiconcount="$(ls -1 gameicons | wc -l)"
32+
serverlistcount="$(tail -n +2 serverlist.csv | wc -l)"
33+
if [ "${gameiconcount}" -ne "${serverlistcount}" ]; then
34+
echo "ERROR: game icons (${gameiconcount}) does not match serverlist.csv ($serverlistcount)"
35+
exitcode=1
36+
else
37+
echo "OK: gameiconcount ($gameiconcount) matches serverlistcount ($serverlistcount)"
38+
fi
39+
40+
exit ${exitcode}

‎.github/workflows/serverlist-validate.sh

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ csvlist="$(ls -1 | grep -E '^(ubuntu|debian|centos|rhel|almalinux|rocky).*\.csv$
1010
# loop though each csv file and make sure the number of lines is the same as the serverlistcount
1111
for csv in $csvlist; do
1212
csvcount="$(wc -l < "${csv}")"
13-
csvcount=$((csvcount-2))
13+
csvcount=$((csvcount - 2))
1414
if [ "$csvcount" -ne "$serverlistcount" ]; then
1515
echo "ERROR: $csv ($csvcount) does not match serverlist.csv ($serverlistcount)"
1616
exitcode=1
@@ -19,4 +19,20 @@ for csv in $csvlist; do
1919
fi
2020
done
2121

22+
# Compare all game servers listed in serverlist.csv to $shortname-icon.png files in lgsm/data/gameicons
23+
# if the game server is listed in serverlist.csv then it will have a $shortname-icon.png file
24+
25+
# loop though shortname in serverlist.csv
26+
echo ""
27+
echo "Checking that all the game servers listed in serverlist.csv have a shortname-icon.png file"
28+
for shortname in $(tail -n +2 serverlist.csv | cut -d ',' -f1); do
29+
# check if $shortname-icon.png exists
30+
if [ ! -f "gameicons/${shortname}-icon.png" ]; then
31+
echo "ERROR: gameicons/${shortname}-icon.png does not exist"
32+
exitcode=1
33+
else
34+
echo "OK: gameicons/${shortname}-icon.png exists"
35+
fi
36+
done
37+
2238
exit ${exitcode}

‎.github/workflows/serverlist-validate.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ jobs:
1212

1313
- name: Compare Versions
1414
run: chmod +x .github/workflows/serverlist-validate.sh; .github/workflows/serverlist-validate.sh
15+
16+
- name: Validate Game Icons
17+
run: chmod +x .github/workflows/serverlist-validate-game-icons.sh; .github/workflows/serverlist-validate-game-icons.sh

‎.prettierrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"plugins": ["prettier-plugin-sh"]
2+
"plugins": ["prettier-plugin-sh"]
33
}

‎lgsm/config-default/config-lgsm/acserver/_default.cfg

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ displayip=""
3232
# More info | https://docs.linuxgsm.com/alerts#more-info
3333
postalert="off"
3434

35+
# Alert on Start/Stop/Restart
36+
statusalert="off"
37+
3538
# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
3639
discordalert="off"
3740
discordwebhook="webhook"
@@ -51,14 +54,6 @@ iftttalert="off"
5154
ifttttoken="accesstoken"
5255
iftttevent="linuxgsm_alert"
5356

54-
# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
55-
mailgunalert="off"
56-
mailgunapiregion="us"
57-
mailguntoken="accesstoken"
58-
mailgundomain="example.com"
59-
mailgunemailfrom="[email protected]"
60-
mailgunemail="[email protected]"
61-
6257
# Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
6358
pushbulletalert="off"
6459
pushbullettoken="accesstoken"
@@ -72,7 +67,6 @@ pushoveruserkey="userkey"
7267
# Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
7368
rocketchatalert="off"
7469
rocketchatwebhook="webhook"
75-
rocketchattoken=""
7670

7771
# Slack Alerts | https://docs.linuxgsm.com/alerts/slack
7872
slackalert="off"

‎lgsm/config-default/config-lgsm/ahl2server/_default.cfg

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ displayip=""
4040
# More info | https://docs.linuxgsm.com/alerts#more-info
4141
postalert="off"
4242

43+
# Alert on Start/Stop/Restart
44+
statusalert="off"
45+
4346
# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
4447
discordalert="off"
4548
discordwebhook="webhook"
@@ -59,14 +62,6 @@ iftttalert="off"
5962
ifttttoken="accesstoken"
6063
iftttevent="linuxgsm_alert"
6164

62-
# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
63-
mailgunalert="off"
64-
mailgunapiregion="us"
65-
mailguntoken="accesstoken"
66-
mailgundomain="example.com"
67-
mailgunemailfrom="[email protected]"
68-
mailgunemail="[email protected]"
69-
7065
# Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
7166
pushbulletalert="off"
7267
pushbullettoken="accesstoken"
@@ -80,7 +75,6 @@ pushoveruserkey="userkey"
8075
# Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
8176
rocketchatalert="off"
8277
rocketchatwebhook="webhook"
83-
rocketchattoken=""
8478

8579
# Slack Alerts | https://docs.linuxgsm.com/alerts/slack
8680
slackalert="off"

‎lgsm/config-default/config-lgsm/ahlserver/_default.cfg

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ displayip=""
3535
# More info | https://docs.linuxgsm.com/alerts#more-info
3636
postalert="off"
3737

38+
# Alert on Start/Stop/Restart
39+
statusalert="off"
40+
3841
# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
3942
discordalert="off"
4043
discordwebhook="webhook"
@@ -54,14 +57,6 @@ iftttalert="off"
5457
ifttttoken="accesstoken"
5558
iftttevent="linuxgsm_alert"
5659

57-
# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
58-
mailgunalert="off"
59-
mailgunapiregion="us"
60-
mailguntoken="accesstoken"
61-
mailgundomain="example.com"
62-
mailgunemailfrom="[email protected]"
63-
mailgunemail="[email protected]"
64-
6560
# Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
6661
pushbulletalert="off"
6762
pushbullettoken="accesstoken"
@@ -75,7 +70,6 @@ pushoveruserkey="userkey"
7570
# Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
7671
rocketchatalert="off"
7772
rocketchatwebhook="webhook"
78-
rocketchattoken=""
7973

8074
# Slack Alerts | https://docs.linuxgsm.com/alerts/slack
8175
slackalert="off"

‎lgsm/config-default/config-lgsm/arkserver/_default.cfg

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ displayip=""
3838
# More info | https://docs.linuxgsm.com/alerts#more-info
3939
postalert="off"
4040

41+
# Alert on Start/Stop/Restart
42+
statusalert="off"
43+
4144
# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
4245
discordalert="off"
4346
discordwebhook="webhook"
@@ -57,14 +60,6 @@ iftttalert="off"
5760
ifttttoken="accesstoken"
5861
iftttevent="linuxgsm_alert"
5962

60-
# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
61-
mailgunalert="off"
62-
mailgunapiregion="us"
63-
mailguntoken="accesstoken"
64-
mailgundomain="example.com"
65-
mailgunemailfrom="[email protected]"
66-
mailgunemail="[email protected]"
67-
6863
# Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
6964
pushbulletalert="off"
7065
pushbullettoken="accesstoken"
@@ -78,7 +73,6 @@ pushoveruserkey="userkey"
7873
# Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
7974
rocketchatalert="off"
8075
rocketchatwebhook="webhook"
81-
rocketchattoken=""
8276

8377
# Slack Alerts | https://docs.linuxgsm.com/alerts/slack
8478
slackalert="off"

0 commit comments

Comments
 (0)