s/d/emacsclient: avoid running same ps cmd twice & move setting var

1 files changed, 4 insertions, 5 deletions

diff --git a/scripts/desktop/emacsclient b/scripts/desktop/emacsclient
index 5671f5fb..f2aa2908 100755
--- a/scripts/desktop/emacsclient
+++ b/scripts/desktop/emacsclient
@@ -17,14 +17,14 @@ while true; do
 done
 [ "$#" -eq 0 ] && set -- -nc
 
-socket="/run/user/$(id -u)/emacs/server"
-ps -o exe -u "$LOGNAME" -U "$LOGNAME" | grep -q "$HOME/src/emacs/src/emacs" \
-    && devel_running=true
+processes=$(ps -o exe -u "$LOGNAME" -U "$LOGNAME")
+echo "$processes" | grep -q "$HOME/src/emacs/src/emacs" && devel_running=true
 
 if [ "$devel_running" = true -a "$mode" = --installed ]; then
     pgrep --full "$HOME/src/emacs/src/emacs" | while read pid; do
 	kill $pid
     done
+    socket="/run/user/$(id -u)/emacs/server"
     [ -e $socket ] && inotifywait -qqt 2 -e delete $socket
 fi
 
@@ -32,8 +32,7 @@ if [ "$mode" != --installed \
 	  -a -e "$HOME/src/emacs/admin/flagfile.melete" \
 	  -a -x "$HOME/src/emacs/lib-src/emacsclient" \
 	  -a -d "/usr/share/emacs-snapshot/site-lisp/elpa" ] \
-       && ! ps -o exe -u "$LOGNAME" -U "$LOGNAME" \
-	   | grep -q $(command -v emacs) \
+       && ! echo "$processes" | grep -q $(command -v emacs) \
        && ! ( [ "$devel_running" != true ] && ps h -o pid -C make \
 		      | xargs pwdx | grep -q "$HOME/src/emacs" ); then
     EMACSCLIENT="$HOME/src/emacs/lib-src/emacsclient"