From 620f76352fb5316ff1098bd12ef89733e0ff1a62 Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Tue, 23 Feb 2021 19:24:55 +0300 Subject: [PATCH] fix: typo and systemd check --- SOURCES/Makefile | 2 +- SOURCES/main/lib/instance.lib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SOURCES/Makefile b/SOURCES/Makefile index 978de29..5439720 100644 --- a/SOURCES/Makefile +++ b/SOURCES/Makefile @@ -67,7 +67,7 @@ build: fake-systemd-build: find $(SOURCEDIR)/main -type f -name '*.service' -exec cp -f {} $(RELEASEDIR)/{} \; find $(RELEASEDIR) -type f -exec sed -i 's|:DEFINE_PREFIX:|$(DESTDIR)$(PREFIX)|g;' {} \; - find $(RELEASEDIR) -type f -exec sed -i -r 's|ExecStart=.+KFGameSteamServer.bin.x86_64|ExecStart=/bin/bash|g;' {} \; + find $(RELEASEDIR) -type f -exec sed -i -r 's|ExecStart=.+KFGameSteamServer.bin.x86_64.*|ExecStart=/bin/bash|g;' {} \; filesystem: test -d '$(CONFDIR)' || install -m 775 -d '$(CONFDIR)' diff --git a/SOURCES/main/lib/instance.lib b/SOURCES/main/lib/instance.lib index 9ac340d..e2b8138 100644 --- a/SOURCES/main/lib/instance.lib +++ b/SOURCES/main/lib/instance.lib @@ -45,7 +45,7 @@ function service_name () # $*: Instance[s] local Services="" for Instance in $* do - if multini -g "$InstanceConfigDir/$Instance" '' "UseOrigApp" 2> /dev/null | grep -Piqo '^True$' && test -x "$AppBinOrig" + if multini -g "$InstanceConfigDir/$Instance" '' "UseOrigApp" 2> /dev/null | grep -Piqo '^True$' && test -x "$AppBinOrig"; then Services+=" kf2-srv${KF2POSTFIX}-orig@$Instance.service" else Services+=" kf2-srv${KF2POSTFIX}@$Instance.service"