Merge branch '4596_fix_command_v'

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>

Author: zyv

src/vfs/extfs/helpers/iso9660.in

@@ -32,7 +32,7 @@
 
 #*** file scope functions **********************************************
 
-XORRISO=$(command -v xorriso >/dev/null 2>&1)
+XORRISO=$(command -v xorriso 2>/dev/null)
 
 # This snippet is used to undo xorriso's Text_shellsafe(). Pseudocode for the
 # function:
@@ -143,7 +143,7 @@ xorriso_rm() {
 
 # tested to comply with isoinfo 2.0's output
 test_iso () {
-    ISOINFO=$(command -v isoinfo >/dev/null 2>&1)
+    ISOINFO=$(command -v isoinfo 2>/dev/null)
     if test -z "$ISOINFO"; then
         echo "isoinfo not found" >&2
         return 1

src/vfs/extfs/helpers/u7z

@@ -17,10 +17,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-P7ZIP=`command -v 7z >/dev/null 2>&1` \
-    || P7ZIP=`command -v 7zz >/dev/null 2>&1` \
-    || P7ZIP=`command -v 7za >/dev/null 2>&1` \
-    || P7ZIP=`command -v 7zr >/dev/null 2>&1` \
+P7ZIP=`command -v 7z 2>/dev/null` \
+    || P7ZIP=`command -v 7zz 2>/dev/null` \
+    || P7ZIP=`command -v 7za 2>/dev/null` \
+    || P7ZIP=`command -v 7zr 2>/dev/null` \
     || P7ZIP=""
 
 # Let the test framework hook in:

src/vfs/extfs/helpers/urar.in

@@ -16,7 +16,7 @@
 RAR=rar
 
 # Prefer unrar (freeware).
-UNRAR=`command -v unrar >/dev/null 2>&1`
+UNRAR=`command -v unrar 2>/dev/null`
 
 [ -z $UNRAR ] && UNRAR=$RAR
 [ ! -x $UNRAR -a -x $RAR ] && UNRAR=$RAR

src/vfs/extfs/helpers/uwim.in

@@ -11,7 +11,7 @@
 # apt install wimtools
 
 command -v wimlib-imagex >/dev/null 2>&1 || exit 1
-WIM=`command -v wimlib-imagex >/dev/null 2>&1`
+WIM=`command -v wimlib-imagex 2>/dev/null`
 AWK=@AWK@
 
 [ -n "$2" ] || exit 1