Migrate the contents of webkitenv into .webkit_login.

[dotfiles.git] / .webkit_login

diff --git a/.webkit_login b/.webkit_login
index 477be0c6d9ab257daf24a8b01e87cd9b9be6fccf..ae4b19cfd4ac623703781d3e2a121bcb3799e9e9 100644 (file)
--- a/.webkit_login
+++ b/.webkit_login
@@ -1,10 +1,32 @@
 #!/bin/bash
 
 #!/bin/bash
 

-export WEBKIT_DIR=~/Projects/WebKit.PuzzleBox
-if [[ -f ${WEBKIT_DIR}/webkitenv ]]; then
-    source ${WEBKIT_DIR}/webkitenv
-fi
-

 function switchto() {
 function switchto() {

-    source ~/Projects/WebKit.$1/webkitenv
+    export OLD_WEBKIT_DIR=$WEBKIT_DIR
+    export WEBKIT_DIR=~/Projects/WebKit.$1
+    if [[ "$OLD_WEBKIT_DIR" == "" ]]; then
+        export PATH=$PATH:$WEBKIT_DIR/OpenSource/Tools:$WEBKIT_DIR/OpenSource/Tools/Scripts:$WEBKIT_DIR/Internal/Tools/Scripts
+    else
+        export PATH=$(echo $PATH | 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"
+    source $WEBKIT_DIR/OpenSource/Tools/Scripts/webkit-tools-completion.sh
+}
+
+function _switchto_complete() {
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    opts=$( for dir in ~/Projects/WebKit.*; do echo ${dir##*.}; done )
+    COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+    return 0

 }
 }

+
+complete -F _switchto_complete switchto
+
+export EMAIL_ADDRESS=jer.noble@apple.com
+export PS1='$( if [ $? = 0 ]; then echo \[\e[32m\]:-\)\ ; else echo \[\e[31m\]:-\(\ ;fi;)\[\e[0m\]$(__git_ps1 "(%s) ")\u@\h:$(short_pwd)> '
+source ~/bin/git-completion.bash
+
+switchto PuzzleBox
\ No newline at end of file