Migrate the contents of webkitenv into .webkit_login.

diff --git a/.webkit_login b/.webkit_login
index d99772ae27eb6a43ff6469b29d3ac989b8fa6f70..ae4b19cfd4ac623703781d3e2a121bcb3799e9e9 100644 (file)
--- a/.webkit_login
+++ b/.webkit_login
@@ -1,10 +1,18 @@
 #!/bin/bash
 
 function switchto() {
 #!/bin/bash
 
 function switchto() {

+    export OLD_WEBKIT_DIR=$WEBKIT_DIR

     export WEBKIT_DIR=~/Projects/WebKit.$1
     export WEBKIT_DIR=~/Projects/WebKit.$1

-    if [[ -f ${WEBKIT_DIR}/webkitenv ]]; then
-        source ${WEBKIT_DIR}/webkitenv
+    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
     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() {
 }
 
 function _switchto_complete() {


@@ -17,4 +25,8 @@ function _switchto_complete() {
 
 complete -F _switchto_complete switchto
 
 
 complete -F _switchto_complete switchto
 

+export [email protected]
+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
 switchto PuzzleBox
\ No newline at end of file