.vimrc: Use real tabs in gitconfig files

[dotfiles.git] / .bash_profile

diff --git a/.bash_profile b/.bash_profile
index 997404022d2d6f2df25a90b6d84be943e10b5534..1122b044fafcea72179f4ffbd15080410a078b06 100644 (file)
--- a/.bash_profile
+++ b/.bash_profile
@@ -5,8 +5,18 @@ if [ -f ~/.bashrc ]; then
   source ~/.bashrc
 fi
 
-# keychain
-if [ -f ~/.ssh/id_dsa ]; then
-  /usr/bin/keychain -q ~/.ssh/id_dsa
-  source ~/.keychain/`hostname`-sh > /dev/null
+# Set mintty color-palette
+if [ "$UNAME" = "Cygwin" ]; then
+  source ~/.mintty/colors/solarized-ansi.sh
 fi
+
+# keychain
+keychain=$(type -P keychain)
+test -n "$keychain" && \
+  test -z "$SUDO_USER" && {
+  if [ -f ~/.ssh/id_rsa ]; then
+    eval `$keychain -q ~/.ssh/id_rsa`
+    source ~/.keychain/`hostname`-sh > /dev/null
+  fi
+}
+unset keychain