modified installer echo out
This commit is contained in:
parent
f6a86d2cc8
commit
b9fb14bc7c
1 changed files with 11 additions and 6 deletions
17
install.sh
17
install.sh
|
|
@ -66,6 +66,7 @@ packages=(
|
||||||
vim
|
vim
|
||||||
lm-sensors
|
lm-sensors
|
||||||
curl
|
curl
|
||||||
|
net-tools
|
||||||
)
|
)
|
||||||
|
|
||||||
# OS distribution auto-detection
|
# OS distribution auto-detection
|
||||||
|
|
@ -187,14 +188,18 @@ install(){
|
||||||
# If script is run as root, run global install
|
# If script is run as root, run global install
|
||||||
if [[ $runuser == root ]] ; then
|
if [[ $runuser == root ]] ; then
|
||||||
installdir="${globalinstalldir}"
|
installdir="${globalinstalldir}"
|
||||||
prbl_bashrc="# Pyr0ball's Reductive Bash Library (PRbL) Functions library v$VERSION and greeting page setup
|
prbl_bashrc="
|
||||||
export prbl_functions=\"${installdir}/functions\""
|
# Pyr0ball's Reductive Bash Library (PRbL) Functions library v$VERSION and greeting page setup
|
||||||
|
export prbl_functions=\"${installdir}/functions\"
|
||||||
|
"
|
||||||
globalinstall
|
globalinstall
|
||||||
else
|
else
|
||||||
# If user is non-root, run user-level install
|
# If user is non-root, run user-level install
|
||||||
installdir="${userinstalldir}"
|
installdir="${userinstalldir}"
|
||||||
prbl_bashrc="# Pyr0ball's Reductive Bash Library (PRbL) Functions library v$VERSION and greeting page setup
|
prbl_bashrc="
|
||||||
export prbl_functions=\"${installdir}/functions\""
|
# Pyr0ball's Reductive Bash Library (PRbL) Functions library v$VERSION and greeting page setup
|
||||||
|
export prbl_functions=\"${installdir}/functions\"
|
||||||
|
"
|
||||||
userinstall
|
userinstall
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
@ -393,8 +398,8 @@ userinstall(){
|
||||||
# Check for existing bashrc config, append if missing
|
# Check for existing bashrc config, append if missing
|
||||||
if [[ $(cat ${HOME}/.bashrc | grep -c 'bashrc.d') == 0 ]] ; then
|
if [[ $(cat ${HOME}/.bashrc | grep -c 'bashrc.d') == 0 ]] ; then
|
||||||
take-backup $HOME/.bashrc
|
take-backup $HOME/.bashrc
|
||||||
run echo -e "$bashrc_append" >> $HOME/.bashrc && boxborder "bashc.d installed..." || warn "Malformed append on ${lbl}${HOME}/.bashrc${dfl}. Check this file for errors"
|
echo -e "$bashrc_append" >> $HOME/.bashrc && boxborder "bashc.d installed..." || warn "Malformed append on ${lbl}${HOME}/.bashrc${dfl}. Check this file for errors"
|
||||||
run echo -e "$prbl_bashrc" >> $HOME/.bashrc.d/00-prbl.bashrc && boxborder "bashc.d/00-prbl installed..." || warn "Malformed append on ${lbl}${HOME}/.bashrc.d/00-prbl.bashrc${dfl}. Check this file for errors"
|
echo -e "$prbl_bashrc" >> $HOME/.bashrc.d/00-prbl.bashrc && boxborder "bashc.d/00-prbl installed..." || warn "Malformed append on ${lbl}${HOME}/.bashrc.d/00-prbl.bashrc${dfl}. Check this file for errors"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue