add abaca support and hostname support for multi-mount home directories

[home-base.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 6ff2b358b468536205e5313123eef5768c5bcc12..eebab56bf4cef9bcd79f6512548d6ce02dcd16d6 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -46,37 +46,57 @@ if [ "$PS1" ]; then
     if [ -f /etc/bash_completion ]; then
       . /etc/bash_completion;
     fi;
+
+    # set up ssh-agent
+    if which ssh-agent >/dev/null && [ -d ~/.ssh ]; then
+       if [ -e ~/.ssh/ssh_agent_info ] && \
+           kill -0 "$(awk -F '[=;]' '/^SSH_AGENT_PID/{print $2}' ~/.ssh/ssh_agent_info)"; then
+           . ~/.ssh/ssh_agent_info > /dev/null
+       elif [ -e ~/.ssh/ssh_agent_info_$(hostname) ] && \
+           kill -0 "$(awk -F '[=;]' '/^SSH_AGENT_PID/{print $2}' ~/.ssh/ssh_agent_info_$(hostname))"; then
+           . ~/.ssh/ssh_agent_info_$(hostname) > /dev/null
+       else
+           ssh-agent -s > ~/.ssh/ssh_agent_info_$(hostname)
+           . ~/.ssh/ssh_agent_info_$(hostname) > /dev/null
+       fi;
+    fi;
     
     alias aumix2='aumix -d /dev/mixer1 -I'
-    export LANG="en_US.UTF-8"
+    if locale -a |grep -qi en_US.utf8; then
+       LANG="en_US.UTF-8"
+    else
+       LANG=C
+    fi;
+    export LANG
     export PATH="~/bin:$PATH"
     if [ ! -e ~/tmp ]; then
        mkdir ~/tmp;
     fi;
     export TMPDIR="$(echo ~/tmp)";
 
-    for a in tda tdd tde; do
-       alias "s${a}"="STODO_NO_COMMIT=1 $a"
-    done;
+    if [ -n "$(which devtodo)" ]; then
+       for a in tda tdd tde; do
+           alias "s${a}"="STODO_NO_COMMIT=1 $a"
+       done;
 
-    TODO_OPTIONS="--timeout --summary"
+       TODO_OPTIONS="--timeout --summary"
 
-    cd ()
-    {
-        builtin cd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
-    }
-
-    pushd ()
-    {
-        builtin pushd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
-    }
-    
-    popd ()
-    {
-        builtin popd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
-    }              
-    
-    # Run todo initially upon login
-    devtodo ${TODO_OPTIONS}
+       cd ()
+       {
+            builtin cd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
+       }
 
+       pushd ()
+       {
+            builtin pushd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
+       }
+       
+       popd ()
+       {
+            builtin popd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
+       }              
+       
+        # Run todo initially upon login
+       devtodo ${TODO_OPTIONS}
+    fi;
 fi