don't fail on failed kill during installation

curusarn · Dec 16, 2019 · b3b9678 · b3b9678
1 parent 5ee66ec
commit b3b9678
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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