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

added further check for release upgrade before attempting to query it

Browse source
This commit is contained in:
pyr0ball 2023-03-19 21:58:31 -07:00
parent 70b3aa3ee8
commit 7e8ba12964
2 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
install.sh
View file

@ -156,7 +156,6 @@ userinstall(){
fi fi
fi fi
# Copy functions first # Copy functions first
cp ${rundir}/functions ${installdir}/functions cp ${rundir}/functions ${installdir}/functions
@ -227,7 +226,7 @@ globalinstall(){
warn "Some of the utilities needed by this script are missing" warn "Some of the utilities needed by this script are missing"
echo -e "Missing utilities:" echo -e "Missing utilities:"
echo -e "$bins_missing" echo -e "$bins_missing"
echo -e "Would you like to install? (this will require root password)" echo -e "Would you like to install them? (this will require root password)"
utilsmissing_menu=( utilsmissing_menu=(
"$(boxline "${green_check} Yes")" "$(boxline "${green_check} Yes")"
"$(boxline "${red_x} No")" "$(boxline "${red_x} No")"

2
lib/skel/.bashrc.d/11-quickinfo.bashrc
View file

@ -241,8 +241,10 @@ fi
# Check for release upgrade # Check for release upgrade
if [ -x /usr/lib/ubuntu-release-upgrader/release-upgrade-motd ]; then if [ -x /usr/lib/ubuntu-release-upgrader/release-upgrade-motd ]; then
if [ -f /var/lib/ubuntu-release-upgrader/release-upgrade-available ] ; then
release_upgrade=$(cat /var/lib/ubuntu-release-upgrader/release-upgrade-available) release_upgrade=$(cat /var/lib/ubuntu-release-upgrader/release-upgrade-available)
fi fi
fi
if [ "$(lsb_release -sd | cut -d ' ' -f4)" = "(development" ]; then if [ "$(lsb_release -sd | cut -d ' ' -f4)" = "(development" ]; then
unset release_upgrade unset release_upgrade
fi fi