|
|
@ -131,7 +131,7 @@ apt_lock_wait
|
|
|
|
#sudo apt update
|
|
|
|
#sudo apt update
|
|
|
|
{
|
|
|
|
{
|
|
|
|
echo -e "Running \e[4msudo a\e[0mp\e[4mt u\e[0mp\e[4mdate\e[0m..."
|
|
|
|
echo -e "Running \e[4msudo a\e[0mp\e[4mt u\e[0mp\e[4mdate\e[0m..."
|
|
|
|
output="$(sudo -E apt update 2>&1)"
|
|
|
|
output="$(sudo -E apt update 2>&1 | tee /dev/stderr)"
|
|
|
|
exitcode=$?
|
|
|
|
exitcode=$?
|
|
|
|
|
|
|
|
|
|
|
|
#inform user about autoremovable packages
|
|
|
|
#inform user about autoremovable packages
|
|
|
@ -169,11 +169,10 @@ for package in $PKG_LIST ;do
|
|
|
|
#change PKG_LIST to contain package name instead of package's absolute path
|
|
|
|
#change PKG_LIST to contain package name instead of package's absolute path
|
|
|
|
PKG_LIST="$(echo "$PKG_LIST" | sed "s|$package|$packagename|")"
|
|
|
|
PKG_LIST="$(echo "$PKG_LIST" | sed "s|$package|$packagename|")"
|
|
|
|
|
|
|
|
|
|
|
|
echo -e "\e[97m\nInstalling local $packagename package...\e[39m"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
apt_lock_wait
|
|
|
|
apt_lock_wait
|
|
|
|
|
|
|
|
echo -e "\e[97m\nInstalling local $packagename package...\e[39m"
|
|
|
|
#install it and reduce apt's output
|
|
|
|
#install it and reduce apt's output
|
|
|
|
output="$(sudo -E apt install -yf --no-install-recommends "$package" 2>&1 | reduceapt | tee /dev/stderr)"
|
|
|
|
output="$(sudo -E apt install -fy --no-install-recommends --allow-downgrades "$package" 2>&1 | reduceapt | tee /dev/stderr)"
|
|
|
|
if [ $? != 0 ];then
|
|
|
|
if [ $? != 0 ];then
|
|
|
|
echo "$output" | apt_diagnose
|
|
|
|
echo "$output" | apt_diagnose
|
|
|
|
error "pkg_install: While installing local packages, $package failed to install."
|
|
|
|
error "pkg_install: While installing local packages, $package failed to install."
|
|
|
@ -260,7 +259,7 @@ fi
|
|
|
|
|
|
|
|
|
|
|
|
apt_lock_wait
|
|
|
|
apt_lock_wait
|
|
|
|
echo -e "\e[97m\nInstalling dummy deb...\e[39m"
|
|
|
|
echo -e "\e[97m\nInstalling dummy deb...\e[39m"
|
|
|
|
output="$(sudo -E apt-get install -y --no-install-recommends ~/pi-apps-$appnamehash.deb 2>&1 | reduceapt | tee /dev/stderr )"
|
|
|
|
output="$(sudo -E apt-get install -fy --no-install-recommends --allow-downgrades ~/pi-apps-$appnamehash.deb 2>&1 | reduceapt | tee /dev/stderr )"
|
|
|
|
rm -f ~/pi-apps-$appnamehash.deb
|
|
|
|
rm -f ~/pi-apps-$appnamehash.deb
|
|
|
|
rm -rf ~/pi-apps-$appnamehash
|
|
|
|
rm -rf ~/pi-apps-$appnamehash
|
|
|
|
|
|
|
|
|
|
|
|