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 6b6f965a718ab435c13c1b9687db65cf20b058e5..da0b8fbf838a73d54b5f9c5676fba1600fba4eeb 100644 (file)
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -1,20 +1,10 @@
-export EDITOR="emc"
-export PAGER="/usr/bin/less -R"
-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
-
-export GPG_AGENT_INFO="${GNUPGHOME:-${HOME}/.gnupg}/S.gpg-agent:-1:1"
+case "$-" in *i*)
+       if [ -r ~/.bashrc ]; then 
+               . ~/.bashrc
+       fi
+       ;; 
+esac