summaryrefslogtreecommitdiff
path: root/bin/debian-ftp-master
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2019-03-19 12:37:22 -0700
committerSean Whitton <spwhitton@spwhitton.name>2019-03-19 12:37:22 -0700
commit29fecc94d813ee283504b088ac603667dbed4980 (patch)
tree82502f32d70ade6c65d364b01f3617994f878c3a /bin/debian-ftp-master
parent22043913661a2c2801743bc6c135f8cd59ec1a4b (diff)
downloaddotfiles-29fecc94d813ee283504b088ac603667dbed4980.tar.gz
also kill old instance of script
Diffstat (limited to 'bin/debian-ftp-master')
-rwxr-xr-xbin/debian-ftp-master9
1 files changed, 6 insertions, 3 deletions
diff --git a/bin/debian-ftp-master b/bin/debian-ftp-master
index 83614336..5180cd41 100755
--- a/bin/debian-ftp-master
+++ b/bin/debian-ftp-master
@@ -13,13 +13,16 @@ set -e
i3-msg workspace 7
# kill off any broken session (e.g. lost WiFi)
-wmctrl -c "ftp-master session cleanup"
-wmctrl -c "ftp-master dak command session"
-wmctrl -c "ftp-master GNU mc session"
+wmctrl -c "ftp-master session cleanup" || :
+wmctrl -c "ftp-master dak command session" || :
+wmctrl -c "ftp-master GNU mc session" || :
# wait, in case xfce4-terminal prompted the user
while wmctrl -l | grep -q -E "ftp-master (session cleanup|dak command session|GNU mc session)"; do
sleep 1
done
+# kill off the old script in case it is waiting to kill the Emacs
+# daemon
+pkill debian-ftp-master || :
# first establish a control socket, so that the two interative ssh
# connections don't race to do this and one of them disables multiplexing