137 lines
5.5 KiB
Plaintext
137 lines
5.5 KiB
Plaintext
$NetBSD: patch-ac,v 1.28 2011/05/11 10:28:08 hans Exp $
|
|
|
|
--- abcde.orig 2010-04-10 10:14:30.000000000 +0900
|
|
+++ abcde 2010-04-10 18:40:03.000000000 +0900
|
|
@@ -415,10 +415,10 @@
|
|
{
|
|
case $1 in
|
|
TRACKNAME1)
|
|
- TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
|
|
+ TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2- -d= | tr -d \[:cntrl:\] | ${SED} 's/\ \+$//')"
|
|
;;
|
|
TRACKNAME)
|
|
- TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
|
|
+ TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | ${SED} 's/\ \+$//')"
|
|
;;
|
|
esac
|
|
}
|
|
@@ -575,32 +575,32 @@
|
|
if [ "$VARIOUSARTISTS" = "y" ] && [ ! "$ONETRACK" = "y" ]; then
|
|
case "$VARIOUSARTISTSTYLE" in
|
|
forward)
|
|
- DTITLEARTIST="$(echo "$TRACKNAME" | sed 's- / -~-g')"
|
|
+ DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's- / -~-g')"
|
|
TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
|
|
TRACKNAME="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
|
|
;;
|
|
forward-dash)
|
|
- DTITLEARTIST="$(echo "$TRACKNAME" | sed 's, - ,~,g')"
|
|
+ DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's, - ,~,g')"
|
|
TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
|
|
TRACKNAME="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
|
|
;;
|
|
reverse)
|
|
- DTITLEARTIST="$(echo "$TRACKNAME" | sed 's- / -~-g')"
|
|
+ DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's- / -~-g')"
|
|
TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
|
|
TRACKNAME="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
|
|
;;
|
|
reverse-dash)
|
|
- DTITLEARTIST="$(echo "$TRACKNAME" | sed 's, - ,~,g')"
|
|
+ DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's, - ,~,g')"
|
|
TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
|
|
TRACKNAME="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
|
|
;;
|
|
colon)
|
|
- DTITLEARTIST="$(echo "$TRACKNAME" | sed 's-: -~-g')"
|
|
+ DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's-: -~-g')"
|
|
TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
|
|
TRACKNAME="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
|
|
;;
|
|
trailing-paren)
|
|
- DTITLEARTIST="$(echo "$TRACKNAME" | sed 's,^\(.*\) (\(.*\)),\1~\2,')"
|
|
+ DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's,^\(.*\) (\(.*\)),\1~\2,')"
|
|
TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
|
|
TRACKNAME="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
|
|
;;
|
|
@@ -1519,7 +1519,7 @@
|
|
if [ "$DOSPLAYLIST" = "y" ]; then
|
|
awk '{substr("\r",""); printf "%s\r\n", $0}' "$OUTPUTDIR/$PLAYLISTFILE" > "$ABCDETEMPDIR/PLAYLISTFILE.tmp"
|
|
# mv -f "$ABCDETEMPDIR/PLAYLISTFILE.tmp" "$OUTPUTDIR/$PLAYLISTFILE"
|
|
- cat "$ABCDETEMPDIR/PLAYLISTFILE.tmp" | sed 's/\//\\/' > "$OUTPUTDIR/$PLAYLISTFILE"
|
|
+ cat "$ABCDETEMPDIR/PLAYLISTFILE.tmp" | ${SED} 's/\//\\/' > "$OUTPUTDIR/$PLAYLISTFILE"
|
|
fi
|
|
echo "playlistcomplete" >> "$ABCDETEMPDIR/status"
|
|
done
|
|
@@ -1703,7 +1703,7 @@
|
|
|
|
#TRACKS=$(echo $CUESHEET | egrep "TRACK \+[[:digit:]]\+ \+AUDIO" |wc -l)
|
|
#TRACKS=0
|
|
- OFFSETTIMES=( $(echo "$CUESHEET" | sed -n -e's/\ *INDEX 01\ \+//p' ) )
|
|
+ OFFSETTIMES=( $(echo "$CUESHEET" | ${SED} -n -e's/\ *INDEX 01\ \+//p' ) )
|
|
TRACKS=${#OFFSETTIMES[@]}
|
|
unset OFFSETS
|
|
#echo "processing offsetimes ${OFFSETTIMES[@]}"
|
|
@@ -1737,7 +1737,7 @@
|
|
# CDPARANOIAAUDIOTRACKS="$TRACKS"
|
|
#
|
|
# LEADOUT="$(echo "$CDPARANOIAOUTPUT" | egrep -o '^TOTAL[[:space:]]+([[:digit:]]+)' | get_last)"
|
|
-# OFFSETS="$(echo "$CDPARANOIAOUTPUT" | sed -n -e's/^ .* \([0-9]\+\) \[.*/\1/p')"
|
|
+# OFFSETS="$(echo "$CDPARANOIAOUTPUT" | ${SED} -n -e's/^ .* \([0-9]\+\) \[.*/\1/p')"
|
|
# makeids
|
|
# ;;
|
|
*)
|
|
@@ -1831,7 +1831,7 @@
|
|
TRACKS=$(echo $TRACKINFO | cut -f2 -d' ')
|
|
# User-supplied track queue.
|
|
# Weed out non-numbers, whitespace, then sort and weed out duplicates
|
|
- TRACKQUEUE=$(echo $TRACKQUEUE | sed 's-[^0-9 ]--g' | tr ' ' '\n' | grep -v ^$ | sort -n | uniq | tr '\n' ' ' | sed 's- $--g')
|
|
+ TRACKQUEUE=$(echo $TRACKQUEUE | ${SED} 's-[^0-9 ]--g' | tr ' ' '\n' | grep -v ^$ | sort -n | uniq | tr '\n' ' ' | ${SED} 's- $--g')
|
|
# Once cleaned, obtain the highest value in the trackqueue for number padding
|
|
for LASTTRACK in $TRACKQUEUE; do :; done
|
|
if [ ! "$PADTRACKS" = "y" ] ; then
|
|
@@ -2760,7 +2760,7 @@
|
|
cddafs)
|
|
# Find the track's mounted path
|
|
REALTRACKNUM=$(expr $UTRACKNUM + 0)
|
|
- FILEPATH=$(mount | grep "$CDROM on" | sed 's/^[^ ]* on \(.*\) (.*/\1/')
|
|
+ FILEPATH=$(mount | grep "$CDROM on" | ${SED} 's/^[^ ]* on \(.*\) (.*/\1/')
|
|
FILEPATH=$(find "$FILEPATH" | grep "/$REALTRACKNUM ");
|
|
# If the file exists, copy it
|
|
if [ -e "$FILEPATH" ] ; then
|
|
@@ -2841,8 +2841,8 @@
|
|
# Custom filename munging:
|
|
mungefilename ()
|
|
{
|
|
- #echo "$@" | sed s,:,\ -,g | tr \ /\* __+ | tr -d \'\"\?\[:cntrl:\]
|
|
- echo "$@" | sed s,:,\ -,g | tr \ / __ | tr -d \'\"\?\[:cntrl:\]
|
|
+ #echo "$@" | ${SED} s,:,\ -,g | tr \ /\* __+ | tr -d \'\"\?\[:cntrl:\]
|
|
+ echo "$@" | ${SED} s,:,\ -,g | tr \ / __ | tr -d \'\"\?\[:cntrl:\]
|
|
}
|
|
|
|
# Custom genre munging:
|
|
@@ -3037,6 +3037,9 @@
|
|
DEFAULT_QUALITY_HI="oggenc:-q 7,lame:--preset standard,speex:--quality 9,m4a:"
|
|
DEFAULT_QUALITY_XHI="oggenc:-q 10,lame:--preset extreme,speex:--quality 10,m4a:"
|
|
|
|
+# We need GNU sed
|
|
+SED=sed
|
|
+
|
|
# Asume fetch if under FreeBSD. curl is used for Mac OS X. wget is used for
|
|
# Linux/OpenBSD. ftp is user for NetBSD.
|
|
# Let's use these checkings to determine the OS flavour, which will be used
|
|
@@ -3060,10 +3063,12 @@
|
|
HTTPGET=ftp
|
|
MD5SUM=md5
|
|
OSFLAVOUR=NBSD
|
|
+ SED=@TOOLS_GSED@
|
|
elif [ X$(uname) = "SunOS" ] ; then
|
|
- HTTPGET=""
|
|
+ HTTPGET=ftp
|
|
MD5SUM=md5
|
|
OSFLAVOUR=SunOS
|
|
+ SED=@TOOLS_GSED@
|
|
else
|
|
HTTPGET=wget
|
|
fi
|