Merge branch 'master' of git.friedersdorff.com:max/dotfiles

[max/dotfiles.git] / bash / .bash_profile

diff --git a/bash/.bash_profile b/bash/.bash_profile
index 106bfe29d732ce376ed82e82591887aafe46becc..da0b8fbf838a73d54b5f9c5676fba1600fba4eeb 100644 (file)
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -1,19 +1,10 @@
-export EDITOR="/usr/bin/vim"
-export PAGER="/usr/bin/less"
-export PATH="/home/max/.local/bin:${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
+if [ -r ~/.profile ]; then
+       . ~/.profile;
 fi
 
-export TMPDIR="/home/max/.local/tmp"
-
-gpg-agent --daemon --enable-ssh-support \
-  --write-env-file "${HOME}/.gpg-agent-info"
+case "$-" in *i*)
+       if [ -r ~/.bashrc ]; then 
+               . ~/.bashrc
+       fi
+       ;; 
+esac