.bashrc.d/00environment: Set GOPATH and GOBIN

[dotfiles-public.git] / src / .bashrc

diff --git a/src/.bashrc b/src/.bashrc
index 6b9965475217869ea81747ae8c7e627c1d926185..a83c50b9cee3fac872dbdad4fa9ab889406daafb 100644 (file)
--- a/src/.bashrc
+++ b/src/.bashrc
@@ -7,12 +7,10 @@
 # past this point for scp and rcp, and it's important to refrain from
 # outputting anything in those cases.
 if [[ $- != *i* ]] ; then
-    # Shell is non-interactive.  Be done now!
-    return
+       # Shell is non-interactive.  Be done now!
+       return
 fi
 
-#source .bashrc.d/local_paths
-
 # If not running interactively, don't do anything else
 [ -z "$PS1" ] && return
 
@@ -21,20 +19,14 @@ fi
 export HISTCONTROL=ignoreboth
 
 # check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
+# update the values of LINES and COLUMNS.  See bash(1).
 shopt -s checkwinsize
 
-source .bashrc.d/environment
-#source .bashrc.d/screen
-#source .bashrc.d/completion
-#source .bashrc.d/nobeep
-#source .bashrc.d/lesspipe
-source .bashrc.d/ssh_agent
-source .bashrc.d/gpg_agent
-
-# load aliases
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
+for FILE in ~/.bashrc.d/*; do
+       if [ -f "${FILE}" ]; then
+               source "${FILE}"
+       fi
+done
 
-source "${DOTFILES_DIR}/src/.bashrc.d/dotfiles"
+# reduce environment pollution
+unset FILE