From 1b417567269b77736fbce2eb1ff70896cb077659 Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Thu, 9 Jul 2020 02:00:53 +0300 Subject: [PATCH] Sun May 31 2020 --- SOURCES/kf2-srv | 6 ++---- SPECS/kf2-srv.spec | 8 +++++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/SOURCES/kf2-srv b/SOURCES/kf2-srv index 3595548..883d7a4 100755 --- a/SOURCES/kf2-srv +++ b/SOURCES/kf2-srv @@ -26,7 +26,7 @@ source /etc/kf2-srv/kf2-srv.conf ScriptFullname=$(readlink -e "$0") ScriptName=$(echo "$ScriptFullname" | awk -F '/' '{print $NF;}') -ScriptVersion="0.9.0" +ScriptVersion="0.9.1" # Constants. Don't change. AppServerNum="232130" @@ -453,9 +453,6 @@ function create_map_dirs () function first_install () { - # TODO: Replace killall - # kill -INT $PID? - # sudo is stopping me from knowing pid if ! steamcmd +login $SteamLogin +force_install_dir $InstallDir +app_update $AppServerNum $BetaArg validate +exit; then echo "Errors during installation - exit" exit 1 @@ -873,6 +870,7 @@ function map_rotate_to_webstring () # $1: MapRotate echo "$1" | \ sed -r 's/^\(Maps=\("//' | \ sed -r 's/"\)\)$//' | \ + sed 's/ /+/g' | \ sed "s/\",\"/${RN}/g" } diff --git a/SPECS/kf2-srv.spec b/SPECS/kf2-srv.spec index 616a3e5..2840aae 100644 --- a/SPECS/kf2-srv.spec +++ b/SPECS/kf2-srv.spec @@ -1,7 +1,7 @@ %global steamuser steam Name: kf2-srv -Version: 0.9.0 +Version: 0.9.1 Release: 1%{dist} Summary: Killing Floor 2 server Group: Amusements/Games @@ -51,6 +51,7 @@ install -m 755 -d %{buildroot}/%{_prefix}/lib/systemd/system install -m 755 -d %{buildroot}/%{_prefix}/lib/firewalld/services install -m 755 -d %{buildroot}/%{_sysconfdir}/%{name}/instances install -m 755 -d %{buildroot}/%{_sysconfdir}/%{name}/instances-beta +install -m 755 -d %{buildroot}/%{_sysconfdir}/%{name}/mapcycles install -m 644 -d %{buildroot}/%{_prefix}/games/%{name} install -m 644 -d %{buildroot}/%{_prefix}/games/%{name}-beta @@ -75,6 +76,7 @@ rm -rf $RPM_BUILD_ROOT %attr(775,root,%{steamuser}) %dir %{_sysconfdir}/%{name} %attr(775,root,%{steamuser}) %dir %{_sysconfdir}/%{name}/instances %attr(775,root,%{steamuser}) %dir %{_sysconfdir}/%{name}/instances-beta +%attr(775,root,%{steamuser}) %dir %{_sysconfdir}/%{name}/mapcycles %attr(644,root,%{steamuser}) %config(noreplace) %{_sysconfdir}/%{name}/main.conf.template %attr(640,root,%{steamuser}) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %attr(644,root,root) %config(noreplace) %{_prefix}/lib/firewalld/services/%{name}.xml @@ -93,6 +95,10 @@ if [[ $1 -eq 0 ]] ; then # Uninstall fi %changelog +* Sun May 31 2020 GenZmeY - 0.9.1-1 +- fix realtime -mrl with spaces; +- mapcycles directory. + * Wed May 27 2020 GenZmeY - 0.9.0-1 - new main.conf format; - multiple WebAdmin and http auth by default;