Commit 52857278 authored by Igor Pecovnik's avatar Igor Pecovnik
Browse files

Bugfix at holding packages. It used to break if one was not installed. Not...

Bugfix at holding packages. It used to break if one was not installed. Not works ok. Small other fixes.
parent 5f52776a
...@@ -27,19 +27,19 @@ if [[ $? -ne 0 ]]; then ...@@ -27,19 +27,19 @@ if [[ $? -ne 0 ]]; then
read -n 1 -s -p "Warning. Configurator can't work properly without internet connection. \ read -n 1 -s -p "Warning. Configurator can't work properly without internet connection. \
Press CTRL C to stop to stop or any key to ignore and continue." Press CTRL C to stop to stop or any key to ignore and continue."
else else
[[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' bc 2>/dev/null) != *ii* ]] && \ [[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' bc 2>/dev/null) != "*ii*" ]] && \
apt-get -qq -y --no-install-recommends install bc apt-get -qq -y --no-install-recommends install bc
[[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' expect 2>/dev/null) != *ii* ]] && \ [[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' expect 2>/dev/null) != "*ii*" ]] && \
apt-get -qq -y --no-install-recommends install expect apt-get -qq -y --no-install-recommends install expect
[[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' rcconf 2>/dev/null) != *ii* ]] && \ [[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' rcconf 2>/dev/null) != "*ii*" ]] && \
apt-get -qq -y --no-install-recommends install rcconf apt-get -qq -y --no-install-recommends install rcconf
[[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' dialog 2>/dev/null) != *ii* ]] && \ [[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' dialog 2>/dev/null) != "*ii*" ]] && \
apt-get -qq -y --no-install-recommends install dialog apt-get -qq -y --no-install-recommends install dialog
[[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' network-manager 2>/dev/null) != *ii* ]] && \ [[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' network-manager 2>/dev/null) != "*ii*" ]] && \
apt-get -qq -y --no-install-recommends install network-manager apt-get -qq -y --no-install-recommends install network-manager
[[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' sunxi-tools 2>/dev/null) != *ii* ]] && \ [[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' sunxi-tools 2>/dev/null) != "*ii*" ]] && \
apt-get -qq -y --no-install-recommends install sunxi-tools apt-get -qq -y --no-install-recommends install sunxi-tools
[[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' iptables 2>/dev/null) != *ii* ]] && \ [[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' iptables 2>/dev/null) != "*ii*" ]] && \
apt-get -qq -y --no-install-recommends install iptables apt-get -qq -y --no-install-recommends install iptables
fi fi
......
...@@ -322,7 +322,7 @@ function jobs () ...@@ -322,7 +322,7 @@ function jobs ()
TEMP_CONF="/etc/network/interfaces.d/armbian.ap.nat" TEMP_CONF="/etc/network/interfaces.d/armbian.ap.nat"
# install dnsmas and iptables # install dnsmas and iptables
if [[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' dnsmasq 2>/dev/null) != *ii* ]]; then if [[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' dnsmasq 2>/dev/null) != "*ii*" ]]; then
debconf-apt-progress -- apt-get -qq -y --no-install-recommends install dnsmasq; debconf-apt-progress -- apt-get -qq -y --no-install-recommends install dnsmasq;
fi fi
...@@ -487,7 +487,7 @@ function jobs () ...@@ -487,7 +487,7 @@ function jobs ()
[[ $BRANCH != "default" ]] && PACKAGE_LIST=$PACKAGE_LIST" linux-dtb$TARGET_BRANCH-$TARGET_FAMILY" [[ $BRANCH != "default" ]] && PACKAGE_LIST=$PACKAGE_LIST" linux-dtb$TARGET_BRANCH-$TARGET_FAMILY"
local words=( $PACKAGE_LIST ) local words=( $PACKAGE_LIST )
apt-mark ${1,,} $PACKAGE_LIST | dialog --backtitle "$BACKTITLE" --title "Packages ${1,,}" --progressbox $((${#words[@]}+2)) 64 for word in $PACKAGE_LIST; do apt-mark ${1,,} $word; done | dialog --backtitle "$BACKTITLE" --title "Packages ${1,,}" --progressbox $((${#words[@]}+2)) 64
fi fi
;; ;;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment