From 4de95fe89f1e7ae73e3c49fe95039743deeece51 Mon Sep 17 00:00:00 2001 From: wjaguar Date: Thu, 9 Dec 2010 11:47:16 +0300 Subject: [PATCH] Ticket #1963: use grep instead of awk in iso9660 extfs plugin. Signed-off-by: Andrew Borodin --- lib/vfs/mc-vfs/extfs/iso9660.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/vfs/mc-vfs/extfs/iso9660.in b/lib/vfs/mc-vfs/extfs/iso9660.in index e03574057..a64958ea3 100644 --- a/lib/vfs/mc-vfs/extfs/iso9660.in +++ b/lib/vfs/mc-vfs/extfs/iso9660.in @@ -15,7 +15,7 @@ test_iso () { fi if test -n "$CHARSET"; then CHARSET=`echo "$CHARSET" | tr '[A-Z]' '[a-z]' | sed -e 's/^iso-/iso/'` - isoinfo -j $CHARSET -i /dev/null 2>&1 | @AWK@ "/Iconv not yet supported|Unknown charset/" >/dev/null && CHARSET= + isoinfo -j $CHARSET -i /dev/null 2>&1 | @GREP@ "Iconv not yet supported\|Unknown charset" >/dev/null && CHARSET= fi if test -n "$CHARSET"; then JOLIET_OPT="-j $CHARSET -J" @@ -23,7 +23,7 @@ test_iso () { JOLIET_OPT="-J" fi ISOINFO="isoinfo -R" - isoinfo -d -i "$1" | @AWK@ "/UCS level 1|NO Joliet/" > /dev/null || ISOINFO="$ISOINFO $JOLIET_OPT" + isoinfo -d -i "$1" 2>/dev/null | @GREP@ "UCS level 1\|NO Joliet" > /dev/null || ISOINFO="$ISOINFO $JOLIET_OPT" } mcisofs_list () {