see SF bug #3416900 "Replace command with which". Generated

script (Linux/iptables) used to use "command -v" to check if command
line tools it needs are present on the system. This was used to find
iptables, lsmod, modprobe, ifconfig, vconfig, logger and others. Some
embedded Linux distributions, notably TomatoUSB, come without support
for "command". Switching to "which" that is more ubuquitous and should
be available pretty much everywhere.

doc/ChangeLog

@@ -1,3 +1,14 @@
+2011-10-02  Vadim Kurland  <vadim@netcitadel.com>
+
+	* shell_functions: see SF bug #3416900 "Replace `command` with
+	`which`".  Generated script (Linux/iptables) used to use "command
+	-v" to check if command line tools it needs are present on the
+	system. This was used to find iptables, lsmod, modprobe, ifconfig,
+	vconfig, logger and others. Some embedded Linux distributions,
+	notably TomatoUSB, come without support for "command". Switching to
+	"which" that is more ubuquitous and should be available pretty
+	much everywhere.
+
 2011-09-29  Vadim Kurland  <vadim@netcitadel.com>
 
 	* SSHSession.cpp (startSession): enable fwbuilder to take

src/res/configlets/dd-wrt-jffs/check_utilities

@@ -28,16 +28,10 @@
 ## These variables are set in OSConfigurator_linux24::printShellFunctions()
 ## About using "command" to find programs:
 ##
-## apparently "command" is POSIX compliant and should be widely
-## available. Another tool that could be used is "type -P" but that is
-## bash built-in
-##
-## Verified DD-WRT v24 and OpenWRT kamikaze 8.09.2 both have command
-## and type (both use busybox)
 
 find_program() {
   PGM=$1
-  command -v $PGM >/dev/null 2>&1 || {
+  which $PGM >/dev/null 2>&1 || {
     echo "$PGM not found"
     exit 1
   }

src/res/configlets/dd-wrt-nvram/check_utilities

@@ -27,18 +27,10 @@
 ##
 ## These variables are set in OSConfigurator_linux24::printShellFunctions()
 ##
-## About using "command" to find programs:
-##
-## apparently "command" is POSIX compliant and should be widely
-## available. Another tool that could be used is "type -P" but that is
-## bash built-in
-##
-## Verified DD-WRT v24 and OpenWRT kamikaze 8.09.2 both have command
-## and type (both use busybox)
 
 find_program() {
   PGM=$1
-  command -v $PGM >/dev/null 2>&1 || {
+  which $PGM >/dev/null 2>&1 || {
     echo "$PGM not found"
     exit 1
   }

src/res/configlets/ipcop/shell_functions

@@ -13,7 +13,7 @@
 
 log() {
     echo "$1"
-    command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
+    which "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
 }
 
 check_file() {

src/res/configlets/linux24/check_utilities

@@ -27,18 +27,10 @@
 ##
 ## These variables are set in OSConfigurator_linux24::printShellFunctions()
 ##
-## About using "command" to find programs:
-##
-## apparently "command" is POSIX compliant and should be widely
-## available. Another tool that could be used is "type -P" but that is
-## bash built-in
-##
-## Verified DD-WRT v24 and OpenWRT kamikaze 8.09.2 both have command
-## and type (both use busybox)
 
 find_program() {
   PGM=$1
-  command -v $PGM >/dev/null 2>&1 || {
+  which $PGM >/dev/null 2>&1 || {
     echo "$PGM not found"
     exit 1
   }

src/res/configlets/linux24/shell_functions

@@ -2,7 +2,7 @@
 
 log() {
     echo "$1"
-    command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
+    which "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
 }
 
 getInterfaceVarName() {

src/res/configlets/openwrt/check_utilities

@@ -11,18 +11,10 @@
 ## {{$var}} is variable expansion
 ## {{if var}} is conditional operator.
 ##
-## About using "command" to find programs:
-##
-## apparently "command" is POSIX compliant and should be widely
-## available. Another tool that could be used is "type -P" but that is
-## bash built-in
-##
-## Verified DD-WRT v24 and OpenWRT kamikaze 8.09.2 both have command
-## and type (both use busybox)
 
 find_program() {
   PGM=$1
-  command -v $PGM >/dev/null 2>&1 || {
+  which $PGM >/dev/null 2>&1 || {
     echo "$PGM not found"
     exit 1
   }

src/res/configlets/sveasoft/shell_functions

@@ -13,7 +13,7 @@
 
 log() {
     echo "$1"
-    command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
+    which "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
 }
 
 check_file() {

src/res/help/en_US/release_notes_5.0.1.html

@@ -233,6 +233,20 @@
       was used in the "Interface" column of a policy rule.
     </p>
   </li>
+
+  <li>
+    <p>
+      see SF bug #3416900 "Replace `command` with `which`".  Generated
+      script (Linux/iptables) used to use "command -v" to check if
+      command line tools it needs are present on the system. This was
+      used to find iptables, lsmod, modprobe, ifconfig, vconfig,
+      logger and others. Some embedded Linux distributions, notably
+      TomatoUSB, come without support for "command". Switching to
+      "which" that is more ubuquitous and should be available pretty
+      much everywhere.
+    </p>
+  </li>
+
 </ul>