From 8ba43627f92c3067390e6e0f8713941118c3bdbd Mon Sep 17 00:00:00 2001 From: Stephan Schaffner Date: Fri, 23 Aug 2024 15:14:50 +0200 Subject: [PATCH] Changing Shortname to XNT --- lgsm/data/almalinux-8.csv | 2 +- lgsm/data/almalinux-9.csv | 2 +- lgsm/data/centos-7.csv | 2 +- lgsm/data/centos-8.csv | 2 +- lgsm/data/centos-9.csv | 2 +- lgsm/data/debian-10.csv | 2 +- lgsm/data/debian-11.csv | 2 +- lgsm/data/debian-12.csv | 2 +- lgsm/data/debian-13.csv | 2 +- lgsm/data/debian-9.csv | 2 +- lgsm/data/rhel-7.csv | 2 +- lgsm/data/rhel-8.csv | 2 +- lgsm/data/rhel-9.csv | 2 +- lgsm/data/rocky-8.csv | 2 +- lgsm/data/rocky-9.csv | 2 +- lgsm/data/serverlist.csv | 2 +- lgsm/data/ubuntu-16.04.csv | 2 +- lgsm/data/ubuntu-18.04.csv | 2 +- lgsm/data/ubuntu-20.04.csv | 2 +- lgsm/data/ubuntu-22.04.csv | 2 +- lgsm/data/ubuntu-23.04.csv | 2 +- lgsm/data/ubuntu-23.10.csv | 2 +- lgsm/data/ubuntu-24.04.csv | 2 +- lgsm/modules/install_server_files.sh | 6 +++--- 24 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lgsm/data/almalinux-8.csv b/lgsm/data/almalinux-8.csv index 54a9d63e9..d4d2456bd 100644 --- a/lgsm/data/almalinux-8.csv +++ b/lgsm/data/almalinux-8.csv @@ -134,6 +134,6 @@ wet wf wmc,java-21-openjdk wurm,xorg-x11-server-Xvfb -xonotic +xnt zmr,ncurses-libs.i686 zps,ncurses-libs.i686 diff --git a/lgsm/data/almalinux-9.csv b/lgsm/data/almalinux-9.csv index 23a0499c3..7dae6338e 100644 --- a/lgsm/data/almalinux-9.csv +++ b/lgsm/data/almalinux-9.csv @@ -134,6 +134,6 @@ wet wf wmc,java-21-openjdk wurm,xorg-x11-server-Xvfb -xonotic +xnt zmr,ncurses-libs.i686 zps,ncurses-libs.i686 diff --git a/lgsm/data/centos-7.csv b/lgsm/data/centos-7.csv index 3b25ed5d8..266b358ba 100644 --- a/lgsm/data/centos-7.csv +++ b/lgsm/data/centos-7.csv @@ -134,6 +134,6 @@ wet wf wmc,java-11-openjdk wurm,xorg-x11-server-Xvfb -xonotic +xnt zmr,ncurses-libs.i686 zps,ncurses-libs.i686 diff --git a/lgsm/data/centos-8.csv b/lgsm/data/centos-8.csv index 62c5d40cd..bd5b72c33 100644 --- a/lgsm/data/centos-8.csv +++ b/lgsm/data/centos-8.csv @@ -134,6 +134,6 @@ wet wf wmc,java-17-openjdk wurm,xorg-x11-server-Xvfb -xonotic +xnt zmr,ncurses-libs.i686 zps,ncurses-libs.i686 diff --git a/lgsm/data/centos-9.csv b/lgsm/data/centos-9.csv index eb663440a..893f3698c 100644 --- a/lgsm/data/centos-9.csv +++ b/lgsm/data/centos-9.csv @@ -134,6 +134,6 @@ wet wf wmc,java-17-openjdk wurm,xorg-x11-server-Xvfb -xonotic +xnt zmr,ncurses-libs.i686 zps,ncurses-libs.i686 diff --git a/lgsm/data/debian-10.csv b/lgsm/data/debian-10.csv index 1fa551017..6bfa1dae4 100644 --- a/lgsm/data/debian-10.csv +++ b/lgsm/data/debian-10.csv @@ -134,6 +134,6 @@ wet wf wmc,openjdk-11-jre wurm,xvfb -xonotic +xnt zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/debian-11.csv b/lgsm/data/debian-11.csv index 57bff70ca..5441a69b4 100644 --- a/lgsm/data/debian-11.csv +++ b/lgsm/data/debian-11.csv @@ -134,6 +134,6 @@ wet wf wmc,openjdk-17-jre wurm,xvfb -xonotic +xnt zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/debian-12.csv b/lgsm/data/debian-12.csv index 0dc4aa3f9..1c0a39930 100644 --- a/lgsm/data/debian-12.csv +++ b/lgsm/data/debian-12.csv @@ -134,6 +134,6 @@ wet wf wmc,openjdk-17-jre wurm,xvfb -xonotic +xnt zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/debian-13.csv b/lgsm/data/debian-13.csv index 72fbbd7ec..af262abb6 100644 --- a/lgsm/data/debian-13.csv +++ b/lgsm/data/debian-13.csv @@ -133,6 +133,6 @@ wet wf wmc,openjdk21-jre wurm,xvfb -xonotic +xnt zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/debian-9.csv b/lgsm/data/debian-9.csv index ab798f4b3..4e54ac241 100644 --- a/lgsm/data/debian-9.csv +++ b/lgsm/data/debian-9.csv @@ -134,6 +134,6 @@ wet wf wmc,openjdk-8-jre wurm,xvfb -xonotic +xnt zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/rhel-7.csv b/lgsm/data/rhel-7.csv index 526c7d115..7800136bb 100644 --- a/lgsm/data/rhel-7.csv +++ b/lgsm/data/rhel-7.csv @@ -134,6 +134,6 @@ wet wf wmc,java-11-openjdk wurm,xorg-x11-server-Xvfb -xonotic +xnt zmr,ncurses-libs.i686 zps,ncurses-libs.i686 diff --git a/lgsm/data/rhel-8.csv b/lgsm/data/rhel-8.csv index 37bfdd980..f8bb1d492 100644 --- a/lgsm/data/rhel-8.csv +++ b/lgsm/data/rhel-8.csv @@ -134,6 +134,6 @@ wet wf wmc,java-21-openjdk wurm,xorg-x11-server-Xvfb -xonotic +xnt zmr,ncurses-libs.i686 zps,ncurses-libs.i686 diff --git a/lgsm/data/rhel-9.csv b/lgsm/data/rhel-9.csv index 23a0499c3..7dae6338e 100644 --- a/lgsm/data/rhel-9.csv +++ b/lgsm/data/rhel-9.csv @@ -134,6 +134,6 @@ wet wf wmc,java-21-openjdk wurm,xorg-x11-server-Xvfb -xonotic +xnt zmr,ncurses-libs.i686 zps,ncurses-libs.i686 diff --git a/lgsm/data/rocky-8.csv b/lgsm/data/rocky-8.csv index 37bfdd980..f8bb1d492 100644 --- a/lgsm/data/rocky-8.csv +++ b/lgsm/data/rocky-8.csv @@ -134,6 +134,6 @@ wet wf wmc,java-21-openjdk wurm,xorg-x11-server-Xvfb -xonotic +xnt zmr,ncurses-libs.i686 zps,ncurses-libs.i686 diff --git a/lgsm/data/rocky-9.csv b/lgsm/data/rocky-9.csv index 23a0499c3..7dae6338e 100644 --- a/lgsm/data/rocky-9.csv +++ b/lgsm/data/rocky-9.csv @@ -134,6 +134,6 @@ wet wf wmc,java-21-openjdk wurm,xorg-x11-server-Xvfb -xonotic +xnt zmr,ncurses-libs.i686 zps,ncurses-libs.i686 diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index 90e4f5d55..8b408f84f 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -133,6 +133,6 @@ wet,wetserver,Wolfenstein: Enemy Territory,ubuntu-22.04 wf,wfserver,Warfork,ubuntu-22.04 wmc,wmcserver,WaterfallMC,ubuntu-22.04 wurm,wurmserver,Wurm Unlimited,ubuntu-22.04 -xonotic,xonoticserver,Xonotic,ubuntu-22.04 +xnt,xntserver,Xonotic,ubuntu-22.04 zmr,zmrserver,Zombie Master: Reborn,ubuntu-22.04 zps,zpsserver,Zombie Panic! Source,ubuntu-22.04 diff --git a/lgsm/data/ubuntu-16.04.csv b/lgsm/data/ubuntu-16.04.csv index 7bb2621fd..51f769c1a 100644 --- a/lgsm/data/ubuntu-16.04.csv +++ b/lgsm/data/ubuntu-16.04.csv @@ -134,6 +134,6 @@ wet wf wmc,openjdk-8-jre wurm,xvfb -xonotic +xnt zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/ubuntu-18.04.csv b/lgsm/data/ubuntu-18.04.csv index 632666d94..7ca2d86c6 100644 --- a/lgsm/data/ubuntu-18.04.csv +++ b/lgsm/data/ubuntu-18.04.csv @@ -134,6 +134,6 @@ wet wf wmc,openjdk-11-jre wurm,xvfb -xonotic +xnt zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/ubuntu-20.04.csv b/lgsm/data/ubuntu-20.04.csv index c48b0dee0..f16d8b3be 100644 --- a/lgsm/data/ubuntu-20.04.csv +++ b/lgsm/data/ubuntu-20.04.csv @@ -134,6 +134,6 @@ wet wf wmc,openjdk-21-jre wurm,xvfb -xonotic +xnt zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/ubuntu-22.04.csv b/lgsm/data/ubuntu-22.04.csv index 68c48348b..e84f4dddd 100644 --- a/lgsm/data/ubuntu-22.04.csv +++ b/lgsm/data/ubuntu-22.04.csv @@ -134,6 +134,6 @@ wet wf wmc,openjdk-21-jre wurm,xvfb -xonotic +xnt zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/ubuntu-23.04.csv b/lgsm/data/ubuntu-23.04.csv index d31d7e07f..c0135abd7 100644 --- a/lgsm/data/ubuntu-23.04.csv +++ b/lgsm/data/ubuntu-23.04.csv @@ -134,6 +134,6 @@ wet wf wmc,openjdk-21-jre wurm,xvfb -xonotic +xnt zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/ubuntu-23.10.csv b/lgsm/data/ubuntu-23.10.csv index d31d7e07f..c0135abd7 100644 --- a/lgsm/data/ubuntu-23.10.csv +++ b/lgsm/data/ubuntu-23.10.csv @@ -134,6 +134,6 @@ wet wf wmc,openjdk-21-jre wurm,xvfb -xonotic +xnt zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/ubuntu-24.04.csv b/lgsm/data/ubuntu-24.04.csv index d31d7e07f..c0135abd7 100644 --- a/lgsm/data/ubuntu-24.04.csv +++ b/lgsm/data/ubuntu-24.04.csv @@ -134,6 +134,6 @@ wet wf wmc,openjdk-21-jre wurm,xvfb -xonotic +xnt zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/modules/install_server_files.sh b/lgsm/modules/install_server_files.sh index 3e1004be5..41b1ea45f 100644 --- a/lgsm/modules/install_server_files.sh +++ b/lgsm/modules/install_server_files.sh @@ -197,7 +197,7 @@ fn_install_server_files() { chmodx="nochmodx" run="norun" force="noforce" md5="93705e165550c97484678236749198a4" - elif [ "${shortname}" == "xonotic" ]; then + elif [ "${shortname}" == "xnt" ]; then remote_fileurl="https://dl.xonotic.org/xonotic-0.8.6.zip" local_filedir="${tmpdir}" local_filename="xonotic-0.8.6.zip" @@ -254,8 +254,8 @@ elif [ "${shortname}" == "vints" ]; then elif [ "${shortname}" == "ut99" ]; then fn_install_server_files update_ut99.sh -elif [ "${shortname}" == "xonotic" ]; then - update_xonotic.sh +elif [ "${shortname}" == "xnt" ]; then + update_xnt.sh elif [ -z "${appid}" ] || [ "${shortname}" == "ahl" ] || [ "${shortname}" == "bb" ] || [ "${shortname}" == "q4" ] || [ "${shortname}" == "ns" ] || [ "${shortname}" == "sfc" ] || [ "${shortname}" == "ts" ] || [ "${shortname}" == "vs" ] || [ "${shortname}" == "zmr" ]; then if [ "${shortname}" == "ut" ]; then install_eula.sh