From: Andrew David Strong <andrew.david.strong@gmail.com>
Date: Mon, 15 Apr 2013 02:28:15 +0000 (+0000)
Subject: Removal of some problematic whitespace generated on MacOSX.
X-Git-Tag: 2.6~24
X-Git-Url: https://git.einval.com/cgi-bin/gitweb.cgi?p=abcde.git;a=commitdiff_plain;h=2f5e32d664d143fe13ef288f5b5bb3acd1276e56;ds=sidebyside

Removal of some problematic whitespace generated on MacOSX.
Thanks to richardjamespearce for the report and patch.
Closes issue 81.
---

diff --git a/abcde b/abcde
index dd56fc2..ababbd3 100755
--- a/abcde
+++ b/abcde
@@ -433,8 +433,8 @@ getcddbinfo()
 gettracknum()
 {
 	if [ -n "$STARTTRACKNUMBER" ] ; then
-		# Get the trackpadding from the current track
-		CURRENTTRACKPADDING=$(echo -n $UTRACKNUM | wc -c)
+		# Get the trackpadding from the current track, also trim whitespace for MacOSX
+		CURRENTTRACKPADDING=$(echo -n $UTRACKNUM | wc -c | tr -d ' ')
 		TRACKNUM=$( printf %0.${CURRENTTRACKPADDING}d $(expr ${UTRACKNUM} + ${STARTTRACKNUMBER} - $FIRSTTRACK ))
 	else
 		TRACKNUM=${UTRACKNUM}