[odrbin] wlstart: properly clean old s6

.local/odrbin/wlstart

@@ -1,8 +1,10 @@
 #!/bin/sh
 
-s6-svscan ~/.s6 <&- &
+s6-svscanctl -t ~/.s6
+s6-svwait -d ~/.s6/*
+s6-svscan ~/.s6 &
 
-trap "s6-svscanctl -t ~/.s6" int quit
+trap "s6-svscanctl -t ~/.s6" INT QUIT EXIT
 
 mkfifo /tmp/dwl_status
 cat /dev/stdin > /tmp/dwl_status

.profile

@@ -35,7 +35,6 @@ if [ "$(tty)" = '/dev/tty1' ]; then
   if command -v dwl > /dev/null; then
     export XDG_CURRENT_DESKTOP=dwl
     pgrep dwl || exec dbus-launch --exit-with-session dwl -s "wlstart"
-    s6-svscanctl -t ~/.s6
   elif command -v startx > /dev/null; then
     pgrep xinit || exec startx
   fi