install vim install edits

This commit is contained in:
pyr0ball 2023-05-07 23:54:56 -07:00
parent 796bf57aec
commit dd6e58a43e
3 changed files with 12 additions and 11 deletions

2
PRbL

@ -1 +1 @@
Subproject commit a2aabfb78f068db4ee2f26208394632fc41b2aa7 Subproject commit adf0fecbdbed55a6956c5a6f7a0f2909eb304055

View file

@ -132,7 +132,7 @@ restore-backup(){
install-file(){ install-file(){
local _source="$1" local _source="$1"
local _destination="$2" 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 _filename=${_source##*/}
local _destination_file=${_destination}/${_filename#${_source_root}} local _destination_file=${_destination}/${_filename#${_source_root}}
installed_files+=("${_destination_file}") installed_files+=("${_destination_file}")
@ -239,7 +239,7 @@ install(){
run sudo python3 ruleMgr.py run sudo python3 ruleMgr.py
popd popd
pushd $installdir/Slipstream 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 popd
} }
@ -262,33 +262,32 @@ usage(){
case $1 in case $1 in
-i | --install) -i | --install)
install && success " [${lbl}Slip${blu}Stream ${lyl}Installed${dfl}]" install && success " [${lbl}Slip${gry}Stream ${lyl}Installed${dfl}]"
;; ;;
-r | --remove) -r | --remove)
remove && success " [${lbl}Slip${blu}Stream ${lyl}Removed${dfl}]" remove && success " [${lbl}Slip${gry}Stream ${lyl}Removed${dfl}]"
;; ;;
-d | --dependencies) -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) -D | --dry-run)
export dry_run=true export dry_run=true
echo dry_run=$dry_run
install install
dry-run-report dry-run-report
usage usage
unset dry_run 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) -u | --update)
export update_run=true 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) -f | --force)
remove-arbitrary remove-arbitrary
install && success " [${lbl}Slip${blu}Stream ${lyl}Installed${dfl}]" install && success " [${lbl}Slip${blu}Stream ${lyl}Installed${dfl}]"
;; ;;
-F | --force-remove) -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) -h | --help)
usage usage

View file

@ -396,7 +396,9 @@ userinstall(){
mkdir -p ${HOME}/.vim/colors mkdir -p ${HOME}/.vim/colors
install-file $rundir/lib/vimfiles/crystallite.vim ${HOME}/.vim/colors install-file $rundir/lib/vimfiles/crystallite.vim ${HOME}/.vim/colors
take-backup $HOME/.vimrc 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 fi
# Check for existing bashrc config, append if missing # Check for existing bashrc config, append if missing