From 2ee04c6c9b2d46a377705557ca8b895ce23bbc3d Mon Sep 17 00:00:00 2001 From: Kaladin Light <0.kaladin@gmail.com> Date: Sat, 30 Apr 2016 14:40:43 -0400 Subject: [PATCH] Missed dependency for new 'pivpn add' requirements --- auto_install/install.sh | 8 ++++++-- scripts/uninstall.sh | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/auto_install/install.sh b/auto_install/install.sh index fe29aab..9749d52 100644 --- a/auto_install/install.sh +++ b/auto_install/install.sh @@ -343,7 +343,7 @@ checkForDependencies() { echo ":::" echo "::: Checking dependencies:" - dependencies=( openvpn easy-rsa git iptables-persistent dnsutils ) + dependencies=( openvpn easy-rsa git iptables-persistent dnsutils expect ) for i in "${dependencies[@]}"; do echo -n "::: Checking for $i..." if [ "$(dpkg-query -W -f='${Status}' "$i" 2>/dev/null | grep -c "ok installed")" -eq 0 ]; then @@ -353,7 +353,11 @@ checkForDependencies() { echo iptables-persistent iptables-persistent/autosave_v4 boolean true | $SUDO debconf-set-selections echo iptables-persistent iptables-persistent/autosave_v6 boolean false | $SUDO debconf-set-selections fi - $SUDO apt-get -y -qq install "$i" > /dev/null & spinner $! + if [[ $i -eq "expect" ]]; then + $SUDO apt-get -y -qq --no-install-recommends install "$i" > /dev/null & spinner $! + else + $SUDO apt-get -y -qq install "$i" > /dev/null & spinner $! + fi echo " done!" else echo " already installed!" diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh index 861dcc1..be17792 100644 --- a/scripts/uninstall.sh +++ b/scripts/uninstall.sh @@ -44,7 +44,7 @@ spinner() function removeAll { # Purge dependencies echo ":::" - dependencies=( openvpn easy-rsa git iptables-persistent dnsutils ) + dependencies=( openvpn easy-rsa git iptables-persistent dnsutils expect ) for i in "${dependencies[@]}"; do if [ "$(dpkg-query -W --showformat='${Status}\n' "$i" 2> /dev/null | grep -c "ok installed")" -eq 1 ]; then while true; do