updates for gpg 2.1

bash_profile

@@ -94,15 +94,3 @@ complete -C aws_completer aws
 
 # Load RVM into a shell session *as a function*
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
-
-
-# ----------------------------------------------------------------------
-#  gpg-agent
-# ----------------------------------------------------------------------
-
-if [ -f "$HOME/.gnupg/.gpg-agent-info" ] && [ -n "$(pgrep gpg-agent)" ]; then
-    source "$HOME/.gnupg/.gpg-agent-info"
-    export GPG_AGENT_INFO
-else
-    eval $(gpg-agent --daemon --write-env-file $HOME/.gnupg/.gpg-agent-info)
-fi

brew.sh

@@ -26,7 +26,8 @@ fi;
 brew install git
 brew install node
 brew install wget
-brew install gpg2
+brew install gpg
+brew install pinentry-mac
 brew install imagemagick
 brew install GraphicsMagick
 brew install tor
@@ -34,8 +35,5 @@ brew install gsl
 brew install mas
 brew install rclone
 
-# Link gpg to gpg2
-ln -s /usr/local/bin/gpg2 /usr/local/bin/gpg
-
 # Remove outdated versions from the cellar.
 brew cleanup