Adjust .bashrc and .bashrc.d/dotfiles with the new dotfiles-framework locations.

Also add ~/ to .bashrc.d sourcings in .bashrc, so you can source
~/.bashrc without being in your home directory.

diff --git a/src/.bashrc b/src/.bashrc
index 6b9965475217869ea81747ae8c7e627c1d926185..3bbae5610ce6b20727d4dd2aa21737e52b2362be 100644 (file)
--- a/src/.bashrc
+++ b/src/.bashrc
@@ -24,17 +24,17 @@ export HISTCONTROL=ignoreboth
 # update the values of LINES and COLUMNS.
 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
+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
 
-source "${DOTFILES_DIR}/src/.bashrc.d/dotfiles"
+source ~/src/dotfiles/public/src/.bashrc.d/dotfiles

diff --git a/src/.bashrc.d/dotfiles b/src/.bashrc.d/dotfiles
index 1a5e5b230c0ea5f8e51556e92cb98dce81445f6b..c4fcf06eb33868cb6ff3f92098d5ae0fcecc665c 100644 (file)
--- a/src/.bashrc.d/dotfiles
+++ b/src/.bashrc.d/dotfiles
@@ -1,6 +1,6 @@
 # Run the dotfiles.sh script if it exists
 
-DS="${DOTFILES_DIR}/bin/dotfiles.sh"
-if [ -f "${DS}" ] && [ -x "${DS}" ]; then
-    "${DS}";
+DS="$(which dotfiles.sh)"
+if [ -n "${DS}" ] && [ -f "${DS}" ] && [ -x "${DS}" ]; then
+       "${DS}" --dotfiles-dir ~/src/dotfiles update
 fi

diff --git a/src/.bashrc.d/environment b/src/.bashrc.d/environment
index 555065226454c46fd9e702d6fccc9a223bbf2e61..29a03db0bdb9c2b3022e71de1c0a3dc5b86ceef8 100644 (file)
--- a/src/.bashrc.d/environment
+++ b/src/.bashrc.d/environment
@@ -1,6 +1,3 @@
-# path to local dotfiles checkout
-export DOTFILES_DIR=~/"src/dotfiles"
-
 # define default programs
 export EDITOR="/usr/bin/emacs -nw"
 export PAGER="less"