diff --git a/bash/rc b/bash/rc index a1d1194..583c113 100644 --- a/bash/rc +++ b/bash/rc @@ -2,7 +2,7 @@ DOTWRYN="$HOME/.wryn" RC_DIR="$DOTWRYN/bash" -source "$HOME/.my_bash_dirs" +source "$HOME/.my_bash_env" # source .wryn/bash files for file in $(find $RC_DIR -maxdepth 1 -type f ! -name 'rc'); do source $file; done; diff --git a/redirect b/redirect index 71e0080..7b40d7e 100755 --- a/redirect +++ b/redirect @@ -12,10 +12,24 @@ grep '.wryn' $HOME/.vimrc >/dev/null 2>/dev/null \ && echo already set up vim rc \ || echo source $RC_DIR/vim/rc.vim >> $HOME/.vimrc; -LOCAL_DIR_SETUP="$HOME/.my_bash_dirs" +LOCAL_DIR_SETUP="$HOME/.my_bash_env" if [ ! -f "$LOCAL_DIR_SETUP" ]; then touch "$LOCAL_DIR_SETUP"; echo '#!/bin/bash' >> $LOCAL_DIR_SETUP - echo 'RD_PATH="";' >> $LOCAL_DIR_SETUP - echo 'SCHOOL_DIR="";' >> $LOCAL_DIR_SETUP + echo 'RD_PATH="$HOME/RentDynamics";' >> $LOCAL_DIR_SETUP + echo 'SCHOOL_DIR="$HOME/School";' >> $LOCAL_DIR_SETUP +else + echo 'bash environment variables already set up' +fi + +LOCAL_VIM_SETUP="$HOME/.my_vim_env" +if [ ! -f "$LOCAL_VIM_SETUP" ]; then + touch "$LOCAL_VIM_SETUP"; + echo 'let $RC_DIR="$HOME/.wryn"' >> $LOCAL_VIM_SETUP + echo 'let $VIM_DIR="$RC_DIR/vim"' >> $LOCAL_VIM_SETUP + echo 'let $WRYNVIMRC="$VIM_DIR/rc.vim"' >> $LOCAL_VIM_SETUP + echo 'let $WRYNBASH="$RC_DIR/bashrc"' >> $LOCAL_VIM_SETUP + echo 'let $MYBASHRC="$HOME/.bashrc"' >> $LOCAL_VIM_SETUP +else + echo 'vim environment variables already set up' fi diff --git a/vim/rc.vim b/vim/rc.vim index e63beb5..bf56be7 100644 --- a/vim/rc.vim +++ b/vim/rc.vim @@ -1,9 +1,10 @@ " -- Environment Variables --------------------------------------- {{{ -let $RC_DIR="/home/w0ryn/.wryn" -let $VIM_DIR="/home/w0ryn/.wryn/vim" -let $WRYNVIMRC="$VIM_DIR/rc.vim" -let $WRYNBASH="$RC_DIR/bashrc" -let $MYBASHRC="/home/w0ryn/.bashrc" +source $HOME/.my_vim_env +"let $RC_DIR="/home/w0ryn/.wryn" +"let $VIM_DIR="/home/w0ryn/.wryn/vim" +"let $WRYNVIMRC="$VIM_DIR/rc.vim" +"let $WRYNBASH="$RC_DIR/bashrc" +"let $MYBASHRC="/home/w0ryn/.bashrc" " }}} " -- General Settings -------------------------------------------- {{{