From 59cdcad6863bd9e4154b02691e10127e7b29f16e Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Tue, 17 Mar 2015 22:40:51 +0000 Subject: [PATCH] alerts --- etc/bashrc.function | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/etc/bashrc.function b/etc/bashrc.function index b83bcf7c..3c795edf 100644 --- a/etc/bashrc.function +++ b/etc/bashrc.function @@ -243,30 +243,31 @@ find-sort-mtime() { } nb-alert() { - local cmd + local cmd=". $NB_ROOT/etc/profile.sh" local host=macbook.brighton.loc case "$1" in led) host=pi.brighton.loc - cmd="echo $FUNCNAME > /var/run/gpiod.sock" + cmd="$cmd && echo $FUNCNAME > /var/run/gpiod.sock" ;; sound) host=pi.brighton.loc - cmd="play 2>/dev/null -v 5 /home/pi/python_games/beep1.ogg" + cmd="$cmd && play 2>/dev/null -v 5 /home/pi/python_games/beep1.ogg" ;; *) host=macbook.brighton.loc - cmd="mac-xmessage \"$FUNCNAME: $1\" 1>/dev/null" + cmd="$cmd && mac-xmessage \"$FUNCNAME: $1\" 1>/dev/null" ;; esac - cmd=". $NB_ROOT/etc/profile.sh && $cmd" + cmd="sh -c '$cmd'" 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" - [ "$USER" != "nico" ] && cmd="su - nico -c '$cmd'" + #[ "$USER" != "nico" ] && cmd="su - nico -c '$cmd'" + [ "$USER" != "nico" ] && cmd="sudo -u nico -- $cmd" eval "$cmd" } -- 2.47.3