[gtpd-cvs] gtkpod/scripts convert-flac2mp3.sh, 1.1, 1.2 convert-ogg2mp3.sh, 1.1, 1.2

[<jc...@us...>]

Update of /cvsroot/gtkpod/gtkpod/scripts
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2855/scripts

Modified Files:
	convert-flac2mp3.sh convert-ogg2mp3.sh 
Log Message:
	* scripts/convert-flac2mp3.sh
	  scripts/convert-ogg2mp3.sh: some minor fixes pointed out by
	  Peter Edwards. Thanks!



Index: convert-flac2mp3.sh
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/scripts/convert-flac2mp3.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- convert-flac2mp3.sh	16 Jan 2007 09:44:58 -0000	1.1
+++ convert-flac2mp3.sh	18 Jan 2007 14:45:34 -0000	1.2
@@ -24,7 +24,7 @@
 #echo "Converting \"$flacfile\" into \"$mp3file\""
 
 # Checking input file
-if [ "$flacfile" == "" ]; then 
+if [ "$flacfile" = "" ]; then 
     exit 1
 fi
 if [ ! -f "$flacfile" ]; then
@@ -32,7 +32,7 @@
 fi
 
 # Checking output file
-touch $mp3file
+touch "$mp3file"
 if [ "x$?" != "x0" ]; then
     exit 2
 fi
@@ -59,7 +59,7 @@
 fi
 
 # Launch command
-exec flac -d -c "$flacfile" | lame -h --add-id3v2 --tt "$title" --ta "$artist" --tl "$album" --ty "$year" --tc "$comment" --tn "$tracknum" --tg "$genre" - "$mp3file"
+exec flac -d -c -- "$flacfile" | lame -h --add-id3v2 --tt "$title" --ta "$artist" --tl "$album" --ty "$year" --tc "$comment" --tn "$tracknum" --tg "$genre" - "$mp3file"
 # Check result
 if [ "x$?" != "x0" ]; then
     exit 6

Index: convert-ogg2mp3.sh
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/scripts/convert-ogg2mp3.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- convert-ogg2mp3.sh	16 Jan 2007 09:44:58 -0000	1.1
+++ convert-ogg2mp3.sh	18 Jan 2007 14:45:34 -0000	1.2
@@ -22,14 +22,14 @@
 #echo "Converting \"$oggfile\" into \"$mp3file\""
 
 # Checking input file
-if [ "$oggfile" == "" ]; then 
+if [ "$oggfile" = "" ]; then 
     exit 1
 fi
 if [ ! -f $oggfile ]; then
     exit 1
 fi
 # Checking output file
-touch $mp3file
+touch "$mp3file"
 if [ "x$?" != "x0" ]; then
     exit 2
 fi
@@ -55,7 +55,7 @@
 fi
 
 # Launch command
-exec oggdec "$oggfile" --output - | lame -h --add-id3v2 --tt "$title" --ta "$artist" --tl "$album" --ty "$year" --tc "$comment" --tn "$tracknum" --tg "$genre" - "$mp3file"
+exec oggdec --output - -- "$oggfile" | lame -h --add-id3v2 --tt "$title" --ta "$artist" --tl "$album" --ty "$year" --tc "$comment" --tn "$tracknum" --tg "$genre" - "$mp3file"
 # Check result
 if [ "x$?" != "x0" ]; then
     exit 6