X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=bash_profile;h=955f6aace7abfd41ce907a9083104922bd3b188c;hb=0938c6ee832b9507bf01d0ca7645326c9b9024b5;hp=499dc529e380cd89bf02f5c43419de9ffa085af9;hpb=bd58ef5147bd0d7cfea4148e69d64634bceaa9d6;p=max%2Fdotfiles.git

diff --git a/bash_profile b/bash_profile
index 499dc52..955f6aa 100644
--- a/bash_profile
+++ b/bash_profile
@@ -1,9 +1,28 @@
 export NPM_PACKAGES="$HOME/.npm-packages"
 export EDITOR="/usr/bin/vim"
 export PAGER="/usr/bin/less"
-export PATH="/home/max/bin:$NPM_PACKAGES/bin:${PATH}"
-export PATH="$PATH:/home/max/bin:$NPM_PACKAGES/bin:$HOME/.rvm/bin"
+export PATH="/home/max/bin:$NPM_PACKAGES/bin:$HOME/.gem/ruby/2.1.0/bin/:$HOME/.rvm/bin:${PATH}"
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
 unset MANPATH
 MANPATH="$NPM_PACKAGES/share/man:$(manpath)"
 NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH"
+
+if [ -n "$BASH_VERSION" ]; then
+  # include .bashrc if it exists
+  if [ -f "$HOME/.bashrc" ]; then
+    . "$HOME/.bashrc"
+  fi
+fi
+
+if [ -f /etc/bash_completion ]; then
+  . /etc/bash_completion
+fi
+
+envfile="$HOME/.gnupg/gpg-agent.env"
+if [[ -e "$envfile" ]] && kill -0 $(grep GPG_AGENT_INFO "$envfile" | cut -d: -f 2) 2>/dev/null; then
+  eval "$(cat "$envfile")"
+else
+  eval "$(gpg-agent --daemon --enable-ssh-support --write-env-file "$envfile")"
+fi
+export GPG_AGENT_INFO  # the env file does not contain the export statement
+export SSH_AUTH_SOCK   # enable gpg-agent for ssh