blob: d39c1732a7adc3a5c4b2b952927356d02b7ac7ea (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
$NetBSD: patch-ac,v 1.17 2004/02/24 19:39:42 snj Exp $
--- abcde.orig 2004-02-15 16:19:36.000000000 -0800
+++ abcde 2004-02-23 10:50:21.000000000 -0800
@@ -1026,7 +1026,11 @@ do_cddbread ()
do_cddbedit ()
{
if checkstatus cddb-edit >/dev/null; then
+ # Strip out ^M
CDDBDATA="$ABCDETEMPDIR/cddbread.$(checkstatus cddb-choice)"
+ CDDBDATATMP="$ABCDETEMPDIR/cddbread.tmp"
+ tr -d '\r' < $CDDBDATA > $CDDBDATATMP
+ mv $CDDBDATATMP $CDDBDATA
VARIOUSARTISTS="$(checkstatus variousartists)"
VARIOUSARTISTSTYLE="$(checkstatus variousartiststyle)"
return 0
@@ -1494,8 +1498,8 @@ if [ -z "$WAVOUTPUTDIR" ]; then
fi
# Load system defaults
-if [ -r /etc/abcde.conf ]; then
- . /etc/abcde.conf
+if [ -r @PKG_SYSCONFDIR@/abcde.conf ]; then
+ . @PKG_SYSCONFDIR@/abcde.conf
fi
# Load user preference defaults
if [ -r $HOME/.abcde.conf ]; then
@@ -1528,6 +1532,9 @@ if [ "$CDROM" = "" ] ; then
CDROM=/dev/acd0c
elif [ -e /dev/disk1 ]; then
CDROM=/dev/disk1
+ else
+ RAWPART=`sysctl -n kern.rawpartition | awk '{printf "%c",97+$0}'`
+ CDROM=/dev/rcd0$RAWPART
fi
fi
@@ -1603,7 +1610,7 @@ fi
case "$CDROMREADERSYNTAX" in
cdparanoia|debug)
CDROMREADER="$CDPARANOIA"
- CDROMREADEROPTS="$CDPARANOIAOPTS"
+ CDROMREADEROPTS="$CDPARANOIAOPTS -g ${CDROM}"
;;
cdda2wav)
CDROMREADER="$CDDA2WAV"
@@ -1737,7 +1744,8 @@ for X in $CDROMREADER $CDDISCID ${NEEDTA
do
# Cut off the command-line options we just added in
X=$(echo $X | cut -d' ' -f2)
- if [ "$(which $X)" = "" ]; then
+ Y="$(which $X | cut -d' ' -f1,2)"
+ if [ "$Y" = "" -o "$Y" = "no $X" ]; then
echo "abcde error: $X is not in your path." >&2
exit 1
elif [ ! -x $(which $X) ]; then
|
