Merge branch 'master' of https://github.com/Matir/skel

.gitignore

@@ -2,3 +2,4 @@ installed-prefs
 *.swp
 *~
 *.bak
+local_dotfiles

dotfiles/bashrc

@@ -40,5 +40,3 @@ if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
 fi
 
 if [[ -e $HOME/.aliases ]] ; then source $HOME/.aliases ; fi
-
-export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting

dotfiles/profile

@@ -13,3 +13,5 @@ if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
   export GPG_TTY=`tty`
 fi
 # End GPG
+
+test -f "${HOME}/.profile.local" && . "${HOME}/.profile.local"

dotfiles/xsessionrc

@@ -1,2 +1,3 @@
 setxkbmap -option ctrl:nocaps
+test -f "$HOME/.env" && "$HOME/.env"
 test -f "$HOME/.profile" && . "$HOME/.profile"

dotfiles/zshrc

@@ -56,5 +56,3 @@ fi
 
 # Load any local settings
 if [ -e $HOME/.zshrc.local ] ; then source $HOME/.zshrc.local ; fi
-
-export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting

install.sh

@@ -84,6 +84,12 @@ function postinstall {
   # Install other useful tools
   install_git https://github.com/trustedsec/ptf.git ${HOME}/bin/ptframework && \
     add_bin_symlink ${HOME}/bin/ptframework/ptf
+  # Refresh all gpg keys
+  if test -x "`which gpg2`" ; then
+    gpg2 --refresh-keys
+  else
+    gpg --refresh-keys
+  fi
 }
 
 function ssh_key_already_installed {
@@ -276,6 +282,8 @@ install_dotfile_dir "${BASEDIR}/dotfiles"
 test -d "${BASEDIR}/private_dotfiles" && \
   test -d "${BASEDIR}/.git/git-crypt" && \
   install_dotfile_dir "${BASEDIR}/private_dotfiles"
+test -d "${BASEDIR}/local_dotfiles" && \
+  install_dotfile_dir "${BASEDIR}/local_dotfiles"
 install_basic_dir "${BASEDIR}/bin" "${HOME}/bin"
 (( $MINIMAL )) || postinstall
 (( $INSTALL_KEYS )) && install_keys