mirror of
https://github.com/pivpn/pivpn.git
synced 2024-12-18 10:50:16 +00:00
merge: drop bsdmainutils pkg
Signed-off-by: corbolais <corbolais@gmail.com>
This commit is contained in:
commit
41dbf2b5c6
1 changed files with 4 additions and 4 deletions
|
@ -22,7 +22,7 @@ PKG_INSTALL="${PKG_MANAGER} --yes --no-install-recommends install"
|
||||||
PKG_COUNT="${PKG_MANAGER} -s -o Debug::NoLocking=true upgrade | grep -c ^Inst || true"
|
PKG_COUNT="${PKG_MANAGER} -s -o Debug::NoLocking=true upgrade | grep -c ^Inst || true"
|
||||||
|
|
||||||
# Dependencies that are required by the script, regardless of the VPN protocol chosen
|
# Dependencies that are required by the script, regardless of the VPN protocol chosen
|
||||||
BASE_DEPS=(git tar wget grep iptables-persistent dnsutils whiptail net-tools)
|
BASE_DEPS=(git tar wget grep iptables-persistent dnsutils whiptail net-tools bsdmainutils)
|
||||||
|
|
||||||
# Dependencies that where actually installed by the script. For example if the script requires
|
# Dependencies that where actually installed by the script. For example if the script requires
|
||||||
# grep and dnsutils but dnsutils is already installed, we save grep here. This way when uninstalling
|
# grep and dnsutils but dnsutils is already installed, we save grep here. This way when uninstalling
|
||||||
|
@ -712,10 +712,10 @@ askWhichVPN(){
|
||||||
|
|
||||||
installOpenVPN(){
|
installOpenVPN(){
|
||||||
echo "::: Installing OpenVPN from Debian package... "
|
echo "::: Installing OpenVPN from Debian package... "
|
||||||
# grepcidr is used to redact IPs in the debug log, expect is used to feed easy-rsa
|
# grepcidr is used to redact IPs in the debug log whereas expect is used
|
||||||
# with passwords, bsdmainutils provides column to format the terminal output
|
# to feed easy-rsa with passwords
|
||||||
local PIVPN_DEPS
|
local PIVPN_DEPS
|
||||||
PIVPN_DEPS=(openvpn grepcidr expect bsdmainutils)
|
PIVPN_DEPS=(openvpn grepcidr expect)
|
||||||
installDependentPackages PIVPN_DEPS[@]
|
installDependentPackages PIVPN_DEPS[@]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue