From 202709a555646255836ec6811119a78e9cc03753 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 27 Mar 2023 23:30:22 +0200 Subject: [PATCH] daemonize forgejo-runner --- forgejo-runner.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/forgejo-runner.sh b/forgejo-runner.sh index cd311b6..e041e69 100755 --- a/forgejo-runner.sh +++ b/forgejo-runner.sh @@ -10,8 +10,8 @@ function dependencies() { tar zxf go1.20.2.linux-amd64.tar.gz export PATH=$PATH:$(pwd)/go/bin fi - if ! which make > /dev/null ; then - apt-get install -y -qq make + if ! which make daemon > /dev/null ; then + apt-get install -y -qq make daemon fi } @@ -39,8 +39,7 @@ function register() { } function run() { - ./forgejo-runner/forgejo-runner daemon >& forgejo-runner.log & - echo $! > forgejo-runner-pid + daemon --chdir=$(pwd) --unsafe --pidfile=$(pwd)/forgejo-runner-pid --errlog=$(pwd)/forgejo-runner.log --output=$(pwd)/forgejo-runner.log ./forgejo-runner/forgejo-runner daemon sleep 1 cat forgejo-runner.log } @@ -59,7 +58,7 @@ function setup() { function teardown() { if test -f forgejo-runner-pid ; then - kill -9 $(cat forgejo-runner-pid) + kill -TERM $(cat forgejo-runner-pid) rm -f forgejo-runner-pid fi }