From 567268bbaaead730daf9212a880205427d090f03 Mon Sep 17 00:00:00 2001
From: Wryn Wagner <wagner.wryn@gmail.com>
Date: Mon, 16 Sep 2019 19:42:08 -0600
Subject: [PATCH] Updated files to not include os specific references

---
 bash/rc           |  2 ++
 bash/rentdynamics |  3 ---
 bash/school       |  6 +-----
 redirect          | 21 +++++++++++++++++++--
 vim/rc.vim        |  6 +++---
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/bash/rc b/bash/rc
index 893c229..a1d1194 100644
--- a/bash/rc
+++ b/bash/rc
@@ -2,6 +2,8 @@
 DOTWRYN="$HOME/.wryn"
 RC_DIR="$DOTWRYN/bash"
 
+source "$HOME/.my_bash_dirs"
+
 # source .wryn/bash files
 for file in $(find $RC_DIR -maxdepth 1 -type f ! -name 'rc'); do source $file; done;
 
diff --git a/bash/rentdynamics b/bash/rentdynamics
index 5dc9bbc..289428d 100644
--- a/bash/rentdynamics
+++ b/bash/rentdynamics
@@ -1,9 +1,6 @@
 #!/bin/bash
-RD_PATH='/Users/w0ryn/Documents/RentDynamics';
-
 alias rdvmail='VMAIL_HOME=~/.vmail/business1 vmail';
 
-
 function rnt() {
 # filestructure needed:
 # RD_PATH/project-name
diff --git a/bash/school b/bash/school
index 70428e5..1403de2 100644
--- a/bash/school
+++ b/bash/school
@@ -1,14 +1,10 @@
 #!/bin/bash
-
-SCHOOL_DIR="$HOME/Documents/School";
-
 # -------------------------------------
 # -- School (Fall 2019) -------------
 # -------------------------------------
 
 alias school="cd $SCHOOL_DIR";
-
-alias classes='cat ~/Documents/School/.classes' 
+alias classes="cat $SCHOOL_DIR/.classes";
 
 alias cs5680='school; cd cs5680__computer_vision';
 alias compvis='cs5680'
diff --git a/redirect b/redirect
index 4fcac31..71e0080 100755
--- a/redirect
+++ b/redirect
@@ -1,4 +1,21 @@
 #!/bin/bash
 RC_DIR='$HOME/.wryn'
-echo source $RC_DIR/bash/rc >> $HOME/.bashrc
-echo source $RC_DIR/vim/rc.vim >> $HOME/.vimrc
+
+[ ! -f "$HOME/.bashrc" ] && touch "$HOME/.bashrc";
+[ ! -f "$HOME/.vimrc" ] && touch "$HOME/.vimrc";
+
+grep '.wryn' $HOME/.bashrc >/dev/null 2>/dev/null \
+	&& echo already set up bash rc \
+	|| echo source $RC_DIR/bash/rc >> $HOME/.bashrc;
+
+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"
+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
+fi
diff --git a/vim/rc.vim b/vim/rc.vim
index 1236f92..e63beb5 100644
--- a/vim/rc.vim
+++ b/vim/rc.vim
@@ -1,9 +1,9 @@
 " -- Environment Variables --------------------------------------- {{{
-let $RC_DIR="/Users/w0ryn/.wryn"
-let $VIM_DIR="/Users/w0ryn/.wryn/vim"
+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="/Users/w0ryn/.bashrc"
+let $MYBASHRC="/home/w0ryn/.bashrc"
 " }}}
 
 " -- General Settings -------------------------------------------- {{{