fix: prevent death at killall

mykeels · Jul 15, 2019 · 20b6f6f · 20b6f6f
1 parent a444877
commit 20b6f6f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/slack-day b/slack-day
@@ -49,15 +49,22 @@ then
         $EXE_FILE </dev/null &>/dev/null & # start slack process in detached mode
     elif [ "$(uname)" == "Linux" ] # Linux OS
     then
-        killall "slack" # kill all slack processes
+        if [ $(ps aux | grep -i slack | wc -l) -gt 1 ]
+        then
+            killall "slack" # kill all slack processes
+        fi
         slack </dev/null &>/dev/null & # start slack process in detached mode
     elif [ "$(uname)" == "Darwin" ] # Mac OS
     then
         if [ $IS_VERSION_4 ]
         then
             sudo asar pack ./files/app.asar.unpacked $ASAR_FILE
         fi
-        killall "Slack" # kill all slack processes
+
+        if [ $(ps aux | grep -i Slack | wc -l) -gt 1 ]
+        then
+            killall "Slack" # kill all slack processes
+        fi
         /Applications/Slack.app/Contents/MacOS/Slack </dev/null &>/dev/null & # start slack process in detached mode
     fi
 fi
diff --git a/slack-theme b/slack-theme
@@ -403,15 +403,22 @@ then
         $EXE_FILE </dev/null &>/dev/null & # start slack process in detached mode
     elif [ "$(uname)" == "Linux" ] # Linux OS
     then
-        killall "slack" # kill all slack processes
+        if [ $(ps aux | grep -i slack | wc -l) -gt 1 ]
+        then
+            killall "slack" # kill all slack processes
+        fi
         slack </dev/null &>/dev/null & # start slack process in detached mode
     elif [ "$(uname)" == "Darwin" ] # Mac OS
     then
         if [ $IS_VERSION_4 ]
         then
             sudo $ASAR pack "$DIR/files/app.asar.unpacked" $ASAR_FILE
         fi
-        killall "Slack" # kill all slack processes
+
+        if [ $(ps aux | grep -i Slack | wc -l) -gt 1 ]
+        then
+            killall "Slack" # kill all slack processes
+        fi
         /Applications/Slack.app/Contents/MacOS/Slack </dev/null &>/dev/null & # start slack process in detached mode
     fi
 else