Fixed ssh-forget function to deal with possible space delimited entries.

[dotfiles.git] / zsh_webkit_login

diff --git a/zsh_webkit_login b/zsh_webkit_login
index 555e6d54db6c0f9103e9ff645ac9e6f7313a3c7d..08bb4088500729ffa7c0db1cf3ca6d774ca322f2 100644 (file)
--- a/zsh_webkit_login
+++ b/zsh_webkit_login
@@ -4,10 +4,13 @@ switchto() {
     export OLD_WEBKIT_DIR=$WEBKIT_DIR
     export WEBKIT_DIR=~/Projects/WebKit.$1
     export WEBKIT_OUTPUTDIR=$WEBKIT_DIR/OpenSource/WebKitBuild
     export OLD_WEBKIT_DIR=$WEBKIT_DIR
     export WEBKIT_DIR=~/Projects/WebKit.$1
     export WEBKIT_OUTPUTDIR=$WEBKIT_DIR/OpenSource/WebKitBuild

+    export PERP_BUILD_PATH=$WEBKIT_OUTPUTDIR

     if [[ "$OLD_WEBKIT_DIR" == "" ]]; then
     if [[ "$OLD_WEBKIT_DIR" == "" ]]; then

-        export PATH=$PATH:$WEBKIT_DIR/OpenSource/Tools:$WEBKIT_DIR/OpenSource/Tools/Scripts:$WEBKIT_DIR/Internal/Tools/Scripts
+        export PATH=$PATH:$WEBKIT_DIR/Internal/Tools/Scripts:$WEBKIT_DIR/OpenSource/Tools:$WEBKIT_DIR/OpenSource/Tools/Scripts
+        export CDPATH=$CDPATH:$WEBKIT_DIR/OpenSource:$WEBKIT_DIR/OpenSource/Source:$WEBKIT_DIR/Internal

     else
         export PATH=$(echo $PATH | sed -e "s;$OLD_WEBKIT_DIR;$WEBKIT_DIR;g")
     else
         export PATH=$(echo $PATH | sed -e "s;$OLD_WEBKIT_DIR;$WEBKIT_DIR;g")

+        export CDPATH=$(echo $CDPATH | sed -e "s;$OLD_WEBKIT_DIR;$WEBKIT_DIR;g")

     fi
     export OLD_WEBKIT_DIR=
 
     fi
     export OLD_WEBKIT_DIR=
 


@@ -19,3 +22,25 @@ _webkit_dirs() { compadd $( for dir in ~/Projects/WebKit.*; do echo ${dir##*.};
 _switchto() { _arguments '1:dir:_webkit_dirs' }
 
 compdef _switchto switchto
 _switchto() { _arguments '1:dir:_webkit_dirs' }
 
 compdef _switchto switchto

+
+if [[ $( has subl ) == 'yes' ]]; then
+    export GUI_EDITOR="subl -w"
+elif [[ $( 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