diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2013-12-01 19:25:01 -0600 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2013-12-02 02:08:40 -0600 |
| commit | 60d288a877a3671ea5b3483ed7c4612ec897b99a (patch) | |
| tree | f370853f0a2f70b1c7491e7107d21ec457a1704e /support/openvpn | |
| parent | 1fccf91df12c3c7f7e68f9fa9a99a71e85d9b98e (diff) | |
remove type command
The posix equivalent of the type command is "command -v", so now we use
that. Thanks to Jonathan Callen <jcallen@gentoo.org> for informing me
wrt the fix.
Diffstat (limited to 'support/openvpn')
| -rwxr-xr-x | support/openvpn/down.sh | 2 | ||||
| -rwxr-xr-x | support/openvpn/up.sh | 2 |
2 files changed, 2 insertions, 2 deletions
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 |