From: Michael Prokop <mika@grml.org>
Date: Sat, 18 Jul 2020 11:33:18 +0000 (+0200)
Subject: Adjust check for iptables binary
X-Git-Tag: v0.103.1~6
X-Git-Url: http://git.grml.org/?p=grml-terminalserver.git;a=commitdiff_plain;h=5d0e708756a7ccd918c86919808104e58bfec74d

Adjust check for iptables binary

Starting with the iptables v1.8.4-1 Debian package the /sbin ->
/usr/sbin compat symlinks no longer exist, fix check for iptables
accordingly.

While at if fix typo (avilable->available).
---

diff --git a/grml-terminalserver b/grml-terminalserver
index 3e7a6aa..f3c8afc 100755
--- a/grml-terminalserver
+++ b/grml-terminalserver
@@ -154,7 +154,7 @@ function runIptables
 
 function startIptables
 {
-  if [ -x /sbin/iptables ] ; then
+  if [ -x $(command -v iptables) ] ; then
     if [[ $NAT_INTERFACE_ != "" ]]; then
        local nat_source_ip_=`netGetIp "$NAT_INTERFACE_" warn`
 
@@ -176,7 +176,7 @@ function startIptables
        fi
     fi
   else
-    warn "iptables executable not avilable"
+    warn "iptables executable not available"
   fi
 }
 
@@ -185,7 +185,7 @@ function stopIptables
   if [[ $IPTABLES_SNAT_ != "true" ]]; then
     return
   fi
-  if [ -x /sbin/iptables ] ; then
+  if [ -x $(command -v iptables) ] ; then
     if [[ $NAT_INTERFACE_ != "" ]]; then
        local nat_source_ip_=`netGetIp "$NAT_INTERFACE_" warn`