Skip to content

Commit

Permalink
Updates to handle the new bash install method
Browse files Browse the repository at this point in the history
  • Loading branch information
danielcbaldwin committed Mar 17, 2016
1 parent 5530f7a commit 3b21132
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion bash/.bash/lib/appearance.bash
Expand Up @@ -9,5 +9,5 @@ export LSCOLORS='Gxfxcxdxdxegedabagacad'

# Load the theme
if [[ $BASH_THEME ]]; then
source "$DOTFILES/bash/themes/$BASH_THEME/$BASH_THEME.theme.bash"
source "$BASHFILES/themes/$BASH_THEME/$BASH_THEME.theme.bash"
fi
4 changes: 2 additions & 2 deletions bash/.bash/lib/helpers.bash
@@ -1,11 +1,11 @@
# Helper function loading various enable-able files
function _load_bash_additions() {
subdirectory="$1"
if [ ! -d "${DOTFILES}/bash/${subdirectory}" ]
if [ ! -d "${BASHFILES}/${subdirectory}" ]
then
continue
fi
FILES="${DOTFILES}/bash/${subdirectory}/*.bash"
FILES="${BASHFILES}/${subdirectory}/*.bash"
for config_file in $FILES
do
if [ -e "${config_file}" ]; then
Expand Down
8 changes: 4 additions & 4 deletions bash/.bash/setup.sh
Expand Up @@ -13,14 +13,14 @@ fi
export TERM=xterm-256color

# add dotfiles bin
export PATH="$PATH:$DOTFILES/bin"
export PATH="$PATH:$BASHFILES/bin"

# Load colors first so they can be use in base theme
source "${DOTFILES}/bash/themes/colors.theme.bash"
source "${DOTFILES}/bash/themes/base.theme.bash"
source "${BASHFILES}/themes/colors.theme.bash"
source "${BASHFILES}/themes/base.theme.bash"

# library
LIB="${DOTFILES}/bash/lib/*.bash"
LIB="${BASHFILES}/lib/*.bash"
for config_file in $LIB
do
source $config_file
Expand Down
5 changes: 3 additions & 2 deletions bash/.bashrc
@@ -1,5 +1,6 @@
#
# ~/.bashrc
#
export DOTFILES="/home/daniel/.dotfiles"
[[ -s "$HOME/.bash/setup.sh" ]] && source "$HOME/.bash/setup.sh"
export DOTFILES="${HOME}/.bash"
export BASHFILES="${HOME}/.bash"
[[ -s "${DOTFILES}/setup.sh" ]] && source "${DOTFILES}/setup.sh"

0 comments on commit 3b21132

Please sign in to comment.