Update zsh options; remove opensource & internal aliases

[dotfiles.git] / zsh_webkit_login

diff --git a/zsh_webkit_login b/zsh_webkit_login
index 6dc46579aab34e1e3d1f3081356f369dd8dc1dbb..16325b61b3798c64054ee121b72d9a960c21313c 100644 (file)
--- a/zsh_webkit_login
+++ b/zsh_webkit_login
@@ -1,18 +1,17 @@
-#/bin/zsh
+#!/bin/zsh

 
 switchto() {
     export OLD_WEBKIT_DIR=$WEBKIT_DIR
     export WEBKIT_DIR=~/Projects/WebKit.$1
 
 switchto() {
     export OLD_WEBKIT_DIR=$WEBKIT_DIR
     export WEBKIT_DIR=~/Projects/WebKit.$1

-    export WEBKIT_OUTPUTDIR=$WEBKIT_DIR/OpenSource/WebKitBuild
+    export PERP_BUILD_PATH=$WEBKIT_DIR/OpenSource/WebKitBuild

     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/:$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=

-
-    alias opensource="cd $WEBKIT_DIR/OpenSource"
-    alias internal="cd $WEBKIT_DIR/Internal"

 }
 
 _webkit_dirs() { compadd $( for dir in ~/Projects/WebKit.*; do echo ${dir##*.}; done ) }
 }
 
 _webkit_dirs() { compadd $( for dir in ~/Projects/WebKit.*; do echo ${dir##*.}; done ) }


@@ -20,4 +19,26 @@ _switchto() { _arguments '1:dir:_webkit_dirs' }
 
 compdef _switchto switchto
 
 
 compdef _switchto switchto
 

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