Circuit-Forge/cf-node-bootstrap
6
0
Fork 0
Code Issues 12 Pull requests Projects Releases Packages Wiki Activity Actions

minor fixes

Browse source
This commit is contained in:
Alan Weinstock 2022-09-01 16:49:59 -07:00
parent 79e0f0a919
commit e43c83b44b
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
install.sh
View file

@ -21,15 +21,14 @@ globalinstalldir="/usr/share/prbl"
read -r -d bashrc_append << EOF read -r -d bashrc_append << EOF
# Pyr0ball's Reductive Bash Language (PRbL) Functions library v$VERSION and greeting page setup # Pyr0ball's Reductive Bash Language (PRbL) Functions library v$VERSION and greeting page setup
export prbl_functions="${installdir}/functions" export prbl_functions="${installdir}/functions"
"if [ -n \"\$BASH_VERSION\" ]; then if [ -n \"\$BASH_VERSION\" ]; then
# include .bashrc if it exists # include .bashrc if it exists
if [ -d \"\$HOME/.bashrc.d\" ]; then if [ -d \"\$HOME/.bashrc.d\" ]; then
for file in \$HOME/.bashrc.d/*.bashrc ; do for file in \$HOME/.bashrc.d/*.bashrc ; do
source \"\$file\" source \"\$file\"
done done
fi fi
fi" fi
EOF EOF
# List of dependency packaged to be istalled via apt # List of dependency packaged to be istalled via apt
@ -66,7 +65,7 @@ detectvim(){
viminstall=$(ls -lah /usr/share/vim/ | grep vim | grep -v rc | awk '{print $NF}') viminstall=$(ls -lah /usr/share/vim/ | grep vim | grep -v rc | awk '{print $NF}')
else else
viminstall=null viminstall=null
boxborder "vim is not currently installed, unable to set up colorscheme and formatting" warn "vim is not currently installed, unable to set up colorscheme and formatting"
fi fi
} }
@ -83,6 +82,11 @@ check-deps(){
fi fi
} }
install-deps(){
sudo /bin/bash -c "apt install -y $(echo -e $packages)"
depsinstalled=true
}
install(){ install(){
if [[ $runuser == root ]] ; then if [[ $runuser == root ]] ; then
installdir="${globalinstalldir}" installdir="${globalinstalldir}"
@ -93,11 +97,6 @@ install(){
fi fi
} }
install-deps(){
sudo /bin/bash -c "apt install -y $packages"
depsinstalled=true
}
userinstall(){ userinstall(){
# Create install directory under user's home directory # Create install directory under user's home directory
mkdir -p ${userinstalldir} mkdir -p ${userinstalldir}