Fixed _ssh_screen alias; made sourcing of webkitenv dependent on file's existence...

diff --git a/.aliases b/.aliases
index 77c68f09d11dbf89f03ff1eaa570de98adcaf22b..12b6b6dc1fc36399d68f3520ac2def227ece368d 100755 (executable)
--- a/.aliases
+++ b/.aliases
@@ -93,6 +93,6 @@ function _ssh_screen () {
     ssh -t $HOST screen $DISCONNECT $RECONNECT
 }
 
     ssh -t $HOST screen $DISCONNECT $RECONNECT
 }
 

-for host in ssh_hosts=$( grep '^Host[ ][^*]' ~/.ssh/config | cut -c 6- ); do
+for host in $( grep '^Host[ ][^*]' ~/.ssh/config | cut -c 6- ); do

     alias "$host"="_ssh_screen $host $@"
 done
     alias "$host"="_ssh_screen $host $@"
 done

diff --git a/.webkit_login b/.webkit_login
index 7d1e52f767706cd9805da74b3dfbc290ac8f81b0..44454bd2c1a806d49aa520ae8913bda57631478c 100644 (file)
--- a/.webkit_login
+++ b/.webkit_login
@@ -1,4 +1,6 @@
 #!/bin/bash
 
 export WEBKIT_DIR=~/Projects/WebKit.git
 #!/bin/bash
 
 export WEBKIT_DIR=~/Projects/WebKit.git

-source ${WEBKIT_DIR}/webkitenv
\ No newline at end of file
+if [[ -f ${WEBKIT_DIR}/webkitenv ]]; then
+    source ${WEBKIT_DIR}/webkitenv
+fi

diff --git a/webkitenv b/webkitenv
deleted file mode 100644 (file)
index da43910..0000000
--- a/webkitenv
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-export EMAIL_ADDRESS=jer.noble@apple.com
-export WEBKIT_DIR=~/Projects/WebKit.git
-export PATH=$PATH:$WEBKIT_DIR/OpenSource/Tools:$WEBKIT_DIR/OpenSource/Tools/Scripts:$WEBKIT_DIR/Internal/Tools/Scripts
-export PS1='$( if [ $? = 0 ]; then echo \[\e[32m\]:-\)\ ; else echo \[\e[31m\]:-\(\ ;fi;)\[\e[0m\]$(__git_ps1 "(%s) ")\u@\h:$(short_pwd)> '
-
-alias opensource="cd $WEBKIT_DIR/OpenSource"
-alias internal="cd $WEBKIT_DIR/Internal"
-
-source ~/bin/git-completion.bash