Added has() function; made EDITOR variables dependent on whether terminal is remote.

diff --git a/zsh_aliases b/zsh_aliases
index dae48a80b8282e58f37070204365030486cc4720..f3307028ed3a578bb76c49721eca2be786108916 100644 (file)
--- a/zsh_aliases
+++ b/zsh_aliases
@@ -51,8 +51,18 @@ function viw () { vi $(which $1); }
 function toss () { mv -f $@ ~/.trashcan; }
 function xcopy () { tar cvf - -C $1 $1/* | tar xvf - -C $2; }
 function checkdns () { ping $( grep nameserver /etc/resolv.conf | awk '{print $2}' | head -1); }
 function toss () { mv -f $@ ~/.trashcan; }
 function xcopy () { tar cvf - -C $1 $1/* | tar xvf - -C $2; }
 function checkdns () { ping $( grep nameserver /etc/resolv.conf | awk '{print $2}' | head -1); }

+function has () { 
+    which $1 &> /dev/null
+    if [[ $? -eq 0 ]]; then
+        echo 'yes'
+        return 0
+    else
+        echo 'no'
+        return 1
+    fi
+}

 
 

-if [[ $(which pidof &> /dev/null; echo $?) -eq 1 ]]; then
+if [[ $( has pidof ) == 'no'  ]]; then

     function pidof () { ps -e -o pid,comm | grep "$1" | awk '{print $1}'; }
 fi
 
     function pidof () { ps -e -o pid,comm | grep "$1" | awk '{print $1}'; }
 fi
 

diff --git a/zsh_webkit_login b/zsh_webkit_login
index 6dc46579aab34e1e3d1f3081356f369dd8dc1dbb..589a236360e9a01b1b3c002df03750d8ebb4ea85 100644 (file)
--- a/zsh_webkit_login
+++ b/zsh_webkit_login
@@ -20,4 +20,22 @@ _switchto() { _arguments '1:dir:_webkit_dirs' }
 
 compdef _switchto switchto
 
 
 compdef _switchto switchto
 

+if [[ $( has bbedit ) == 'yes' ]]; then
+    export GUI_EDITOR="bbedit -w"
+elif [[ $( has mate_wait ) == 'yes' ]]; then
+    export GUI_EDITOR="mate_wait"
+else
+    export GUI_EDITOR="vim"
+fi
+
+if [[ -z "$SSH_TTY" ]]; then
+    export EDITOR="$GUI_EDITOR"
+    export SVN_LOG_EDITOR="$GUI_EDITOR"
+    export GIT_SEQUENCE_EDITOR="$GUI_EDITOR"
+else
+    export EDITOR=vim
+    export SVN_LOG_EDITOR=vim
+    export GIT_SEQUENCE_EDITOR=vim
+fi
+

 switchto git
 switchto git