Committing all changes before migrating servers

[tpope-extra.git] / perl / away-tpope

diff --git a/perl/away-tpope b/perl/away-tpope
index e4e7adbad435bfcdee5d168e74d5ac9f0659b671..a82fb848cea1334e2cd173ece5bd96f90ac1365f 100755 (executable)
--- a/perl/away-tpope
+++ b/perl/away-tpope
@@ -195,9 +195,7 @@ sub do_chat {
 }
 
 sub eval_chat {
-    if(($state{'chat'}||'') eq "jmwaller" || ($state{'chat'}||'') eq "arwen") {
-       internal_out("Work",3*60*60);
-    } elsif(($state{'chat'}||'') =~ /^tpope-\d+$/) {
+    if(($state{'chat'}||'') =~ /^(tpope-\d+|jmwaller|arwen|george)$/) {
        internal_out("Work",3*60*60);
     } elsif(($state{'chat'}||'') eq "accd") {
        #internal_out("School",30*60);
@@ -245,7 +243,7 @@ sub is_alive {
     eval {
        local $SIG{ALRM} = sub { die "alarm\n" };
        alarm(30);
-       $ret=!(system(@ssh,shift, 'if pidof xscreensaver >/dev/null && DISPLAY=:0.0 xscreensaver-command -version >/dev/null 2>&1; then if DISPLAY=:0.0 xscreensaver-command -time 2>&1 |egrep "non-blanked|no saver status" >/dev/null; then true; else pid=`ps ax|egrep "[0-9]:[0-9][0-9] ssh michael .*(screen.*RR irc|Chat)"|sed -e "s/^  *//"|cut -d" " -f 1`; [ -f "$HOME/.irc.lock" -o -z "$pid" ] || kill $pid; false; fi; else false; fi') >> 8);
+       $ret=!(system(@ssh,shift, 'if pidof xscreensaver >/dev/null && DISPLAY=:0.0 xscreensaver-command -version >/dev/null 2>&1; then if DISPLAY=:0.0 xscreensaver-command -time 2>&1 |egrep "non-blanked|no saver status" >/dev/null; then true; else pid=`ps ax|egrep "[0-9]:[0-9][0-9] ssh gob .*(screen.*RR irc|Chat)"|sed -e "s/^  *//"|cut -d" " -f 1`; [ -f "$HOME/.irc.lock" -o -z "$pid" ] || kill $pid; false; fi; else false; fi') >> 8);
        alarm(0);
     };
     if($@) {