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