From f4e318ead195f190703dc8b02ef45f8d7d0f4d2d Mon Sep 17 00:00:00 2001
From: Jer Noble <jer.noble@apple.com>
Date: Fri, 10 Jul 2020 09:28:31 -0700
Subject: [PATCH 1/1] Update zsh options; remove opensource & internal aliases

---
 zsh_login        | 2 ++
 zsh_webkit_login | 5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/zsh_login b/zsh_login
index 8318680..2a24355 100644
--- a/zsh_login
+++ b/zsh_login
@@ -33,6 +33,8 @@ setopt SHARE_HISTORY
 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:
diff --git a/zsh_webkit_login b/zsh_webkit_login
index dfa4dfe..16325b6 100644
--- 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 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=
-
-    alias opensource="cd $WEBKIT_DIR/OpenSource"
-    alias internal="cd $WEBKIT_DIR/Internal"
 }
 
 _webkit_dirs() { compadd $( for dir in ~/Projects/WebKit.*; do echo ${dir##*.}; done ) }
-- 
2.40.1