alerts

diff --git a/etc/bashrc.function b/etc/bashrc.function
index 682490d81cabfe84ea291b6a55d0d9fadc34e708..b83bcf7c50d51bd6252da1bfc3750aa0b276b76c 100644 (file)
--- a/etc/bashrc.function
+++ b/etc/bashrc.function
@@ -10,7 +10,7 @@ case "$OSTYPE" in darwin*)
   }
 
   mac-xmessage() {
-    osascript -e 'tell app "System Events" to display dialog "'$@'"'
+    osascript -e "tell app \"System Events\" to display dialog \"$@\""
   }
 
   mac-config() {
@@ -256,7 +256,7 @@ nb-alert() {
     ;;
     *)
       host=macbook.brighton.loc
-      cmd="mac-xmessage $FUNCNAME:$1"
+      cmd="mac-xmessage \"$FUNCNAME: $1\" 1>/dev/null"
     ;;
   esac
   cmd=". $NB_ROOT/etc/profile.sh && $cmd"
@@ -264,9 +264,9 @@ nb-alert() {
   local ip=`dig +short $host`
   [ -z "$ip" ] && echo "Can't resolve macbook.brighton.loc" && return 1
 
-  nb-ips | grep -qFm1 "$ip" || cmd="ssh -o BatchMode=yes $host '$cmd'"
+  nb-ips | grep -qFm1 "$ip" || cmd="ssh -o BatchMode=yes $host -- $cmd"
 
-  [ "$USER" != "nico" ] && cmd="su - nico -c \"$cmd\""
+  [ "$USER" != "nico" ] && cmd="su - nico -c '$cmd'"
   eval "$cmd"
 }