From 60d288a877a3671ea5b3483ed7c4612ec897b99a Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Sun, 1 Dec 2013 19:25:01 -0600 Subject: remove type command The posix equivalent of the type command is "command -v", so now we use that. Thanks to Jonathan Callen for informing me wrt the fix. --- support/openvpn/down.sh | 2 +- support/openvpn/up.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'support') diff --git a/support/openvpn/down.sh b/support/openvpn/down.sh index 93dd53ca..b94862b1 100755 --- a/support/openvpn/down.sh +++ b/support/openvpn/down.sh @@ -6,7 +6,7 @@ [ -x "${RC_SVCNAME}"-down.sh ] && "${RC_SVCNAME}"-down.sh # Restore resolv.conf to how it was -if type resolvconf >/dev/null 2>&1; then +if command -v resolvconf >/dev/null 2>&1; then resolvconf -d "${dev}" elif [ -e /etc/resolv.conf-"${dev}".sv ]; then # Important that we copy instead of move incase resolv.conf is diff --git a/support/openvpn/up.sh b/support/openvpn/up.sh index f207dce0..8e210698 100755 --- a/support/openvpn/up.sh +++ b/support/openvpn/up.sh @@ -45,7 +45,7 @@ if [ -n "${NS}" ]; then DNS="${DNS}domain ${DOMAIN}\n" fi DNS="${DNS}${NS}" - if type resolvconf >/dev/null 2>&1; then + if command -v resolvconf >/dev/null 2>&1; then printf "${DNS}" | resolvconf -a "${dev}" else # Preserve the existing resolv.conf -- cgit v1.2.3