Revision: 2334
          http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2334&view=rev
Author:   tmzullinger
Date:     2009-04-20 22:01:08 +0000 (Mon, 20 Apr 2009)

Log Message:
-----------
scripts/convert-2mp3.sh: Improve lame genre test

Lame prints the output of --genre-list to stderr.  The grep for $genre
was also too lenient and matched more than it should.

Modified Paths:
--------------
    gtkpod/trunk/ChangeLog
    gtkpod/trunk/scripts/convert-2mp3.sh

Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog      2009-04-18 16:08:42 UTC (rev 2333)
+++ gtkpod/trunk/ChangeLog      2009-04-20 22:01:08 UTC (rev 2334)
@@ -1,3 +1,11 @@
+2009-04-20  Todd Zullinger  <[email protected]>
+
+       * scripts/convert-2mp3.sh: Improve lame genre test
+
+         Lame prints the output of --genre-list to stderr.  The grep
+         for $genre was also too lenient and matched more than it
+         should.
+
 2009-04-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
        * src/display.c

Modified: gtkpod/trunk/scripts/convert-2mp3.sh
===================================================================
--- gtkpod/trunk/scripts/convert-2mp3.sh        2009-04-18 16:08:42 UTC (rev 
2333)
+++ gtkpod/trunk/scripts/convert-2mp3.sh        2009-04-20 22:01:08 UTC (rev 
2334)
@@ -27,7 +27,7 @@
 . ${0%/*}/gtkpod-convert-common.sh
 
 # Check if the genre is one which lame supports
-if [ -n "$genre" ] && `"$encoder" --genre-list | grep -qi "\b$genre\b"`; then
+if [ -n "$genre" ] && `"$encoder" --genre-list 2>&1 | cut -c 5- | grep -qi 
"^$genre$"`; then
     usegenre=$genre
 else
     usegenre=""


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and 
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today. 
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to