Replace `$BASH` with `$BASH_IT` because `$BASH` is already used on *nix systems for the pathname to the executable (http://www.gnu.org/software/bash/manual/html_node/Bash-Variables.html#Bash-Variables)
parent
11214382c5
commit
323ce20a2d
16
bash_it.sh
16
bash_it.sh
|
|
@ -7,11 +7,11 @@ alias reload='source ~/.bash_profile'
|
|||
# Load the framework
|
||||
|
||||
# Load colors first so they can be use in base theme
|
||||
source "${BASH}/themes/colors.theme.bash"
|
||||
source "${BASH}/themes/base.theme.bash"
|
||||
source "${BASH_IT}/themes/colors.theme.bash"
|
||||
source "${BASH_IT}/themes/base.theme.bash"
|
||||
|
||||
# Library
|
||||
LIB="${BASH}/lib/*.bash"
|
||||
LIB="${BASH_IT}/lib/*.bash"
|
||||
for config_file in $LIB
|
||||
do
|
||||
source $config_file
|
||||
|
|
@ -20,11 +20,11 @@ done
|
|||
# Load enabled aliases, completion, plugins
|
||||
for file_type in "aliases" "completion" "plugins"
|
||||
do
|
||||
if [ ! -d "${BASH}/${file_type}/enabled" ]
|
||||
if [ ! -d "${BASH_IT}/${file_type}/enabled" ]
|
||||
then
|
||||
continue
|
||||
fi
|
||||
FILES="${BASH}/${file_type}/enabled/*.bash"
|
||||
FILES="${BASH_IT}/${file_type}/enabled/*.bash"
|
||||
for config_file in $FILES
|
||||
do
|
||||
source $config_file
|
||||
|
|
@ -32,13 +32,13 @@ do
|
|||
done
|
||||
|
||||
# Load any custom aliases that the user has added
|
||||
if [ -e "${BASH}/aliases/custom.aliases.bash" ]
|
||||
if [ -e "${BASH_IT}/aliases/custom.aliases.bash" ]
|
||||
then
|
||||
source "${BASH}/aliases/custom.aliases.bash"
|
||||
source "${BASH_IT}/aliases/custom.aliases.bash"
|
||||
fi
|
||||
|
||||
# Custom
|
||||
CUSTOM="${BASH}/custom/*.bash"
|
||||
CUSTOM="${BASH_IT}/custom/*.bash"
|
||||
for config_file in $CUSTOM
|
||||
do
|
||||
source $config_file
|
||||
|
|
|
|||
14
install.sh
14
install.sh
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env bash
|
||||
BASH="$HOME/.bash_it"
|
||||
BASH_IT="$HOME/.bash_it"
|
||||
|
||||
cp $HOME/.bash_profile $HOME/.bash_profile.bak
|
||||
|
||||
|
|
@ -30,24 +30,24 @@ done
|
|||
|
||||
function load_all() {
|
||||
file_type=$1
|
||||
[ ! -d "$BASH/$file_type/enabled" ] && mkdir "$BASH/${file_type}/enabled"
|
||||
ln -s $BASH/${file_type}/available/* "${BASH}/${file_type}/enabled"
|
||||
[ ! -d "$BASH_IT/$file_type/enabled" ] && mkdir "$BASH_IT/${file_type}/enabled"
|
||||
ln -s $BASH_IT/${file_type}/available/* "${BASH_IT}/${file_type}/enabled"
|
||||
}
|
||||
|
||||
function load_some() {
|
||||
file_type=$1
|
||||
for file in `ls $BASH/${file_type}/available`
|
||||
for file in `ls $BASH_IT/${file_type}/available`
|
||||
do
|
||||
if [ ! -d "$BASH/$file_type/enabled" ]
|
||||
if [ ! -d "$BASH_IT/$file_type/enabled" ]
|
||||
then
|
||||
mkdir "$BASH/$file_type/enabled"
|
||||
mkdir "$BASH_IT/$file_type/enabled"
|
||||
fi
|
||||
while true
|
||||
do
|
||||
read -p "Would you like to enable the ${file%.*.*} $file_type? [Y/N] " RESP
|
||||
case $RESP in
|
||||
[yY])
|
||||
ln -s "$BASH/$file_type/available/$file" "$BASH/$file_type/enabled"
|
||||
ln -s "$BASH_IT/$file_type/available/$file" "$BASH_IT/$file_type/enabled"
|
||||
break
|
||||
;;
|
||||
[nN])
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@ export GREP_COLOR='1;33'
|
|||
export LSCOLORS='Gxfxcxdxdxegedabagacad'
|
||||
|
||||
# Load the theme
|
||||
if [[ $BASH_THEME ]]; then
|
||||
source "$BASH/themes/$BASH_THEME/$BASH_THEME.theme.bash"
|
||||
if [[ $BASH_IT_THEME ]]; then
|
||||
source "$BASH_IT/themes/$BASH_IT_THEME/$BASH_IT_THEME.theme.bash"
|
||||
fi
|
||||
|
|
@ -7,11 +7,11 @@
|
|||
export PATH=$PATH:~/.gem/ruby/1.8/bin:/opt/nginx/sbin
|
||||
|
||||
# Path to the bash it configuration
|
||||
export BASH=$HOME/.bash_it
|
||||
export BASH_IT=$HOME/.bash_it
|
||||
|
||||
# Lock and Load a custom theme file
|
||||
# location /.bash_it/themes/
|
||||
export BASH_THEME='bobby'
|
||||
export BASH_IT_THEME='bobby'
|
||||
|
||||
# Your place for hosting Git repos. I use this for private repos.
|
||||
export GIT_HOSTING='git@git.domain.com'
|
||||
|
|
@ -40,4 +40,4 @@ export TODO="t"
|
|||
#export VCPROMPT_EXECUTABLE=~/.vcprompt/bin/vcprompt
|
||||
|
||||
# Load Bash It
|
||||
source $BASH/bash_it.sh
|
||||
source $BASH_IT/bash_it.sh
|
||||
|
|
|
|||
Loading…
Reference in New Issue