changed globalinstall to check deps first

This commit is contained in:
Alan Weinstock 2022-09-01 13:54:03 -07:00
parent 2e49a15fe2
commit 04d5350906

View file

@ -134,20 +134,8 @@ userinstall(){
globalinstall(){ globalinstall(){
mkdir -p ${globalinstalldir} mkdir -p ${globalinstalldir}
cp ${rundir}/pyr0-bash-functions/functions ${globalinstalldir}/functions cp ${rundir}/pyr0-bash-functions/functions ${globalinstalldir}/functions
cp -r ${rundir}/lib/skel/* $HOME cp -r ${rundir}/lib/skel/* /etc/skel/
cp -r ${rundir}/lib/skel/.* $HOME cp -r ${rundir}/lib/skel/.* /etc/skel/
detectvim
if [[ $viminstall != null ]] ; then
cp $rundir/lib/vimfiles/crystallite.vim /usr/share/vim/${viminstall}/colors/crystallite.vim
cp $rundir/lib/vimfiles/vimrc.local /etc/vim/vimrc.local
fi
if [[ $(cat ${HOME}/.bashrc | grep -c pyr0) = 0 ]] ; then
echo -e $bashrc_append >> $HOME/.bashrc && center "bashc.d installed..." || fail "Unable to append .bashrc"
fi
crontab -l -u $runuser | cat - ${rundir}/lib/quickinfo.cron | crontab -u $runuser -
mkdir -p $HOME/.quickinfo
bash $HOME/.bashrc.d/11-quickinfo.bashrc -c
clear
check-deps check-deps
if [[ "$bins_missing" != "false" ]] ; then if [[ "$bins_missing" != "false" ]] ; then
warn "Some of the utilities needed by this script are missing" warn "Some of the utilities needed by this script are missing"
@ -169,8 +157,20 @@ globalinstall(){
1) warn "Dependent Utilities missing: $bins_missing" ;; 1) warn "Dependent Utilities missing: $bins_missing" ;;
esac esac
fi fi
boxborder "${grn}Please be sure to run ${lyl}sensors-detect --auto${grn} after installation completes" detectvim
success "${red}P${lrd}R${ylw}b${ong}L ${lyl}Installed${dfl}" if [[ $viminstall != null ]] ; then
cp $rundir/lib/vimfiles/crystallite.vim /usr/share/vim/${viminstall}/colors/crystallite.vim
cp $rundir/lib/vimfiles/vimrc.local /etc/vim/vimrc.local
fi
if [[ $(cat /etc/skel/.bashrc | grep -c prbl) = 0 ]] ; then
echo -e $bashrc_append >> /etc/skel/.bashrc && center "bashc.d installed..." || fail "Unable to append .bashrc"
fi
crontab -l -u $runuser | cat - ${rundir}/lib/quickinfo.cron | crontab -u $runuser -
sensors-detect --auto
mkdir -p $HOME/.quickinfo
bash $HOME/.bashrc.d/11-quickinfo.bashrc -c
clear
success " [${red}P${lrd}R${ylw}b${ong}L ${lyl}Installed${dfl}]"
} }