[totem] Bug 592647 — MIME scripts need quotes around ^# for grep
- From: Philip Withnall <pwithnall src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [totem] Bug 592647 — MIME scripts need quotes around ^# for grep
- Date: Fri, 28 Aug 2009 13:34:39 +0000 (UTC)
commit 4d6e27ba6185ee5c90837f2bcf64b4cc720ac42a
Author: Tim Mooney <mooney dogbert cc ndsu nodak edu>
Date: Fri Aug 28 14:32:05 2009 +0100
Bug 592647 â?? MIME scripts need quotes around ^# for grep
Patch to add quotes around ^# for grep so that the build doesn't print
warnings on Solaris.
data/mime-functions.sh | 4 ++--
data/mime-type-include.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/data/mime-functions.sh b/data/mime-functions.sh
index 1ee717f..0ea9c40 100644
--- a/data/mime-functions.sh
+++ b/data/mime-functions.sh
@@ -2,13 +2,13 @@
get_audio_mimetypes ()
{
- MIMETYPES=`grep -v ^# $1 | grep "\/" | grep audio | grep -v "audio/x-pn-realaudio" | grep -v "audio/x-scpls" | grep -v "audio/mpegurl" | grep -v "audio/x-mpegurl"`
+ MIMETYPES=`grep -v '^#' $1 | grep "\/" | grep audio | grep -v "audio/x-pn-realaudio" | grep -v "audio/x-scpls" | grep -v "audio/mpegurl" | grep -v "audio/x-mpegurl"`
MIMETYPES="$MIMETYPES application/x-flac"
}
get_video_mimetypes ()
{
- MIMETYPES=`grep -v ^# $1 | grep -v x-content/ | grep -v audio | grep -v "application/x-flac" | grep -v "text/google-video-pointer" | grep -v "application/x-quicktime-media-link" | grep -v "application/smil" | grep -v "application/smil+xml" | grep -v "application/x-smil" | grep -v "application/xspf+xml"`
+ MIMETYPES=`grep -v '^#' $1 | grep -v x-content/ | grep -v audio | grep -v "application/x-flac" | grep -v "text/google-video-pointer" | grep -v "application/x-quicktime-media-link" | grep -v "application/smil" | grep -v "application/smil+xml" | grep -v "application/x-smil" | grep -v "application/xspf+xml"`
MIMETYPES="$MIMETYPES audio/x-pn-realaudio"
}
diff --git a/data/mime-type-include.sh b/data/mime-type-include.sh
index 81c82f7..9c269b1 100755
--- a/data/mime-type-include.sh
+++ b/data/mime-type-include.sh
@@ -22,7 +22,7 @@ if [ x"$1" = "x--nautilus" ] ; then
exit 0
fi
-MIMETYPES=`grep -v ^# $1 | grep -v x-content/`
+MIMETYPES=`grep -v '^#' $1 | grep -v x-content/`
echo "/* generated with mime-types-include.sh, don't edit */"
echo "const char *mime_types[] = {"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]