From b3b9678277ac1ce21d3b7c303e80e1dcfe4d3474 Mon Sep 17 00:00:00 2001 From: Simon Let Date: Mon, 16 Dec 2019 04:09:33 +0100 Subject: [PATCH] don't fail on failed kill during installation --- scripts/install.sh | 2 +- scripts/rawinstall.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index e041d88..413edf7 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -130,7 +130,7 @@ touch ~/.resh_history.json # Restarting resh daemon ... if [ -f ~/.resh/resh.pid ]; then - kill -SIGTERM "$(cat ~/.resh/resh.pid)" + kill -SIGTERM "$(cat ~/.resh/resh.pid)" || true rm ~/.resh/resh.pid else pkill -SIGTERM "resh-daemon" || true diff --git a/scripts/rawinstall.sh b/scripts/rawinstall.sh index 185463b..ebbd35b 100755 --- a/scripts/rawinstall.sh +++ b/scripts/rawinstall.sh @@ -109,5 +109,6 @@ if ! scripts/install.sh; then echo "You can rerun the installation by executing: (this will skip downloading)" echo echo "cd $PWD && scripts/install.sh" + echo exit 1 fi \ No newline at end of file