.bashrc: Add more docker-related helper aliases
[dotfiles.git] / .bash_profile
index d963b4c8a786d3ed6dcc380e0b85f2121c081238..be7ef93e81c4c2eb05c5fac93c9580eb1351b95c 100644 (file)
@@ -5,15 +5,22 @@ if [ -f ~/.bashrc ]; then
   source ~/.bashrc
 fi
 
+# Set mintty color-palette
+if [ "$UNAME" = "Cygwin" ]; then
+  source ~/.mintty/colors/solarized-ansi.sh
+fi
+
 # keychain
-keychain="$(type -P keychain)"
-test -n "$keychain" && {
-  if [ -f ~/.ssh/id_rsa ]; then
-    eval `$keychain -q ~/.ssh/id_rsa`
+keychain=$(type -P keychain)
+test -n "$keychain" && \
+  test -z "$SUDO_USER" && {
+  ids=""
+  test -f ~/.ssh/id_rsa && ids="$ids id_rsa"
+  test -f ~/.ssh/id_ed25519 && ids="$ids id_ed25519"
+  if [ -n "$ids" ]; then
+    eval `$keychain -q $ids`
     source ~/.keychain/`hostname`-sh > /dev/null
   fi
+  unset ids
 }
 unset keychain
-
-# Load RVM function
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"