From 96537097a2db57591ccc42621fd5541b5cc4f739 Mon Sep 17 00:00:00 2001 From: mckaygerhard Date: Tue, 3 Jan 2023 09:54:37 -0400 Subject: [PATCH] property install service files for sysviniti and shitstemd * sed command at install make to change install path * only install sysvinit and shitstemd service units * service unit for openrc is provided at misc/alpine directory --- CMakeLists.txt | 11 ++++++----- misc/multicraftserver.init | 2 +- misc/multicraftserver.service | 2 +- misc/multicraftserver@.service | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b497b428f..3560b95d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,12 +193,13 @@ if(UNIX AND NOT APPLE) install(FILES "misc/net.minetest.multicraft.desktop" DESTINATION "${XDG_APPS_DIR}") install(FILES "misc/net.minetest.multicraft.appdata.xml" DESTINATION "${APPDATADIR}") install(FILES "misc/multicraft.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps") - install(FILES "misc/multicraft-xorg-icon-128.png" - DESTINATION "${ICONDIR}/hicolor/128x128/apps" - RENAME "multicraft.png") - install(FILES "misc/multicraftserver*service" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system/") - install(FILES "misc/multicraftserver*init" DESTINATION "${CMAKE_INSTALL_PREFIX}/../etc/init.d/" RENAME "multicraftserver") + install(FILES "misc/multicraft-xorg-icon-128.png" DESTINATION "${ICONDIR}/hicolor/128x128/apps" RENAME "multicraft.png") + install(FILES "misc/multicraftserver.service" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system/") + install(FILES "misc/multicraftserver@.service" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system/") + install(FILES "misc/multicraftserver.init" DESTINATION "${CMAKE_INSTALL_PREFIX}/../etc/init.d/" RENAME "multicraftserver") install(FILES "misc/multicraft.logrotate" DESTINATION "${CMAKE_INSTALL_PREFIX}/../etc/logrotate.d/" RENAME "multicraftserver") + install(CODE "execute_process(COMMAND sed -i -r \"s@INSTALLPLACE@${CMAKE_INSTALL_PREFIX}@g\" \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/systemd/system/multicraftserver*service)") + install(CODE "execute_process(COMMAND sed -i -r \"s@INSTALLPLACE@${CMAKE_INSTALL_PREFIX}@g\" \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/../etc/init.d/multicraftserver*)") endif() if(APPLE) diff --git a/misc/multicraftserver.init b/misc/multicraftserver.init index 40b242983..e0f5b0e7e 100644 --- a/misc/multicraftserver.init +++ b/misc/multicraftserver.init @@ -9,7 +9,7 @@ # Description: dedicated game server for multicraft ### END INIT INFO -PATHBIN="@INSTALLPLACE@" +PATHBIN="INSTALLPLACE/bin" PATHLOG="/var/log/multicraft" PATHETC="/etc/multicraft/muticraft.conf" diff --git a/misc/multicraftserver.service b/misc/multicraftserver.service index f498617a0..01f396a37 100644 --- a/misc/multicraftserver.service +++ b/misc/multicraftserver.service @@ -8,7 +8,7 @@ RequiresMountsFor=/var/games/multicraft Restart=on-failure User=multicraft Group=games -ExecStart=@INSTALLPLACE@/multicraftserver --config /etc/multicraft/multicraft.conf --logfile /var/log/multicraft/multicraft.log +ExecStart=INSTALLPLACE/bin/multicraftserver --config /etc/multicraft/multicraft.conf --logfile /var/log/multicraft/multicraft.log StandardOutput=null [Install] diff --git a/misc/multicraftserver@.service b/misc/multicraftserver@.service index a4c24a73f..d4a9583d1 100644 --- a/misc/multicraftserver@.service +++ b/misc/multicraftserver@.service @@ -8,7 +8,7 @@ RequiresMountsFor=/var/games/multicraft Restart=on-failure User=multicraft Group=games -ExecStart=@INSTALLPLACE@/multicraftserver --config /etc/multicraft/%i.conf --logfile /var/log/multicraft/%i.log +ExecStart=INSTALLPLACE/bin/multicraftserver --config /etc/multicraft/%i.conf --logfile /var/log/multicraft/%i.log StandardOutput=null [Install]