Update zsh options; remove opensource & internal aliases

diff --git a/zsh_login b/zsh_login
index 83186801abd8b462c6b3f3c321360d0b3c572044..2a24355e0bdee9b4084433e3126154d6274b17cc 100644 (file)
--- a/zsh_login
+++ b/zsh_login
@@ -33,6 +33,8 @@ setopt SHARE_HISTORY
 setopt extended_glob
 setopt AUTO_CD
 setopt DVORAK
 setopt extended_glob
 setopt AUTO_CD
 setopt DVORAK

+setopt CDABLE_VARS
+setopt CD_SILENT

 
 PS1=$'%(?.😊.😡)  %(1v.%1v .)%n@%m:%(3~,.../,)%2~> '
 PATH=~/bin:$PATH:~/homebrew/bin:
 
 PS1=$'%(?.😊.😡)  %(1v.%1v .)%n@%m:%(3~,.../,)%2~> '
 PATH=~/bin:$PATH:~/homebrew/bin:

diff --git a/zsh_webkit_login b/zsh_webkit_login
index dfa4dfe52d4474b2e9da4afff54407cf00cdb451..16325b61b3798c64054ee121b72d9a960c21313c 100644 (file)
--- a/zsh_webkit_login
+++ b/zsh_webkit_login
@@ -6,15 +6,12 @@ switchto() {
     export PERP_BUILD_PATH=$WEBKIT_DIR/OpenSource/WebKitBuild
     if [[ "$OLD_WEBKIT_DIR" == "" ]]; then
         export PATH=$PATH:$WEBKIT_DIR/Internal/Tools/Scripts:$WEBKIT_DIR/OpenSource/Tools:$WEBKIT_DIR/OpenSource/Tools/Scripts
     export PERP_BUILD_PATH=$WEBKIT_DIR/OpenSource/WebKitBuild
     if [[ "$OLD_WEBKIT_DIR" == "" ]]; then
         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
+        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")
         export CDPATH=$(echo $CDPATH | sed -e "s;$OLD_WEBKIT_DIR;$WEBKIT_DIR;g")
     fi
     export OLD_WEBKIT_DIR=
     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=

-
-    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 ) }