mirror of
https://github.com/MidnightCommander/mc
synced 2025-01-24 12:12:19 +03:00
Ticket #1963: use grep instead of awk in iso9660 extfs plugin.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
parent
ab50316f40
commit
4de95fe89f
@ -15,7 +15,7 @@ test_iso () {
|
|||||||
fi
|
fi
|
||||||
if test -n "$CHARSET"; then
|
if test -n "$CHARSET"; then
|
||||||
CHARSET=`echo "$CHARSET" | tr '[A-Z]' '[a-z]' | sed -e 's/^iso-/iso/'`
|
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
|
fi
|
||||||
if test -n "$CHARSET"; then
|
if test -n "$CHARSET"; then
|
||||||
JOLIET_OPT="-j $CHARSET -J"
|
JOLIET_OPT="-j $CHARSET -J"
|
||||||
@ -23,7 +23,7 @@ test_iso () {
|
|||||||
JOLIET_OPT="-J"
|
JOLIET_OPT="-J"
|
||||||
fi
|
fi
|
||||||
ISOINFO="isoinfo -R"
|
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 () {
|
mcisofs_list () {
|
||||||
|
Loading…
Reference in New Issue
Block a user