From dd6e58a43e61616f9e52dd598eb988c12ba97e3e Mon Sep 17 00:00:00 2001
From: pyr0ball <pyroballpcs@gmail.com>
Date: Sun, 7 May 2023 23:54:56 -0700
Subject: [PATCH] install vim install edits

---
 PRbL                      |  2 +-
 extras/Slipstream.install | 17 ++++++++---------
 install.sh                |  4 +++-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/PRbL b/PRbL
index a2aabfb..adf0fec 160000
--- a/PRbL
+++ b/PRbL
@@ -1 +1 @@
-Subproject commit a2aabfb78f068db4ee2f26208394632fc41b2aa7
+Subproject commit adf0fecbdbed55a6956c5a6f7a0f2909eb304055
diff --git a/extras/Slipstream.install b/extras/Slipstream.install
index ac5eee7..54669b4 100755
--- a/extras/Slipstream.install
+++ b/extras/Slipstream.install
@@ -132,7 +132,7 @@ restore-backup(){
 install-file(){
     local _source="$1"
     local _destination="$2"
-    local _source_root="$3"
+    local _source_root="$3" # Optional 3rd argument if root dir is different than rundir
     local _filename=${_source##*/}
     local _destination_file=${_destination}/${_filename#${_source_root}}
     installed_files+=("${_destination_file}")
@@ -239,7 +239,7 @@ install(){
         run sudo python3 ruleMgr.py
     popd
     pushd $installdir/Slipstream
-        run codeDog ./Slipstream.dog && success "Slipstream app built at ${installdir}/Slipstream/LinuxBuild"
+        run $installdir/CodeDog/codeDog ./Slipstream.dog && logger "Slipstream app built at ${installdir}/Slipstream/LinuxBuild"
     popd
 }
 
@@ -262,33 +262,32 @@ usage(){
 
 case $1 in
     -i | --install)
-        install && success " [${lbl}Slip${blu}Stream ${lyl}Installed${dfl}]"
+        install && success " [${lbl}Slip${gry}Stream ${lyl}Installed${dfl}]"
         ;;
     -r | --remove)
-        remove && success " [${lbl}Slip${blu}Stream ${lyl}Removed${dfl}]"
+        remove && success " [${lbl}Slip${gry}Stream ${lyl}Removed${dfl}]"
         ;;
     -d | --dependencies)
-        install-deps && success "${lbl}Slip${blu}Stream ${dfl} Dependencies installed!"
+        install-deps && success "${lbl}Slip${gry}Stream ${dfl} Dependencies installed!"
         ;;
     -D | --dry-run)
         export dry_run=true
-        echo dry_run=$dry_run
         install
         dry-run-report
         usage
         unset dry_run
-        success "${lbl}Slip${blu}Stream Installer Dry-Run Complete!"
+        success "${lbl}Slip${gry}Stream ${lyl}Installer Dry-Run Complete!${dfl}"
         ;;
     -u | --update)
         export update_run=true
-        update && unset update_run && success " [${lbl}Slip${blu}Stream ${lyl}Updated${dfl}]"
+        update && unset update_run && success " [${lbl}Slip${gry}Stream ${lyl}Updated${dfl}]"
         ;;
     -f | --force)
         remove-arbitrary
         install && success " [${lbl}Slip${blu}Stream ${lyl}Installed${dfl}]"
         ;;
     -F | --force-remove)
-        remove-arbitrary && success " [${lbl}Slip${blu}Stream ${lyl}Force-Removed${dfl}]"
+        remove-arbitrary && success " [${lbl}Slip${gry}Stream ${lyl}Force-Removed${dfl}]"
         ;;
     -h | --help)
         usage
diff --git a/install.sh b/install.sh
index d5fad20..42159f9 100755
--- a/install.sh
+++ b/install.sh
@@ -396,7 +396,9 @@ userinstall(){
         mkdir -p ${HOME}/.vim/colors
         install-file $rundir/lib/vimfiles/crystallite.vim ${HOME}/.vim/colors
         take-backup $HOME/.vimrc
-        install-file $rundir/lib/vimfiles/vimrc.local $HOME/.vimrc
+        cp $rundir/lib/vimfiles/vimrc.local $rundir/lib/vimfiles/.vimrc
+        install-file $rundir/lib/vimfiles/.vimrc $HOME
+        rm $rundir/lib/vimfiles/.vimrc
     fi
 
     # Check for existing bashrc config, append if missing