summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorben <ben>2003-11-25 22:04:03 +0000
committerben <ben>2003-11-25 22:04:03 +0000
commit49c024246816f67e132c696822feb6a73a72873d (patch)
tree588ad87400bc25db19aed1e1b44e443f931784ea /audio
parente26d2fb07caf7bba42f4371458a458676586c2a2 (diff)
downloadpkgsrc-49c024246816f67e132c696822feb6a73a72873d.tar.gz
Make mod2wav correctly handle filenames with spaces or shell special
characters. Bump PKGREVISION. Closes PR 19745 by myself.
Diffstat (limited to 'audio')
-rw-r--r--audio/gmodplay/Makefile4
-rwxr-xr-xaudio/gmodplay/files/mod2wav12
2 files changed, 8 insertions, 8 deletions
diff --git a/audio/gmodplay/Makefile b/audio/gmodplay/Makefile
index 934bb0dd90e..afa512ae783 100644
--- a/audio/gmodplay/Makefile
+++ b/audio/gmodplay/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/22 19:34:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/25 22:04:03 ben Exp $
DISTNAME= gmodplay-0.08
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://magic.metawire.com/~rani/ \
http://rani.free.fr/
diff --git a/audio/gmodplay/files/mod2wav b/audio/gmodplay/files/mod2wav
index 9cb452568e0..39ad669fcae 100755
--- a/audio/gmodplay/files/mod2wav
+++ b/audio/gmodplay/files/mod2wav
@@ -5,7 +5,7 @@
CMD=$(basename $0)
-if [ x = x$1 ]
+if [ -z "$*" ]
then
echo "
Usage: $CMD <module>
@@ -23,14 +23,14 @@ FATAL: I can't find sox in your path. Is it installed?
exit
fi
-WAVDIR=$(dirname $1)
-WAVNAME=$(basename $1|tr 'A-Z' 'a-z').wav
+WAVDIR=$(dirname "$*")
+WAVNAME=$(basename "$*").wav
-echo -e "$1 -> $WAVDIR/$WAVNAME\c"
+echo -e "$* -> $WAVDIR/$WAVNAME\c"
echo -e " [step 1]\c"
-gmodplay -n -w $1 >/dev/null 2>&1
+gmodplay -n -w "$*" >/dev/null 2>&1
if [ $? -ne 0 ]
then
echo "
@@ -41,7 +41,7 @@ fi
echo -e " [step 2]\c"
chmod a+r output.raw
-sox -t raw -r 44100 -s -w -c 2 output.raw $WAVDIR/$WAVNAME >/dev/null 2>&1
+sox -t raw -r 44100 -s -w -c 2 output.raw "$WAVDIR/$WAVNAME" >/dev/null 2>&1
if [ $? -ne 0 ]
then
echo "