X-Original-To: alpine-devel@lists.alpinelinux.org
Delivered-To: alpine-devel@lists.alpinelinux.org
Received: from smtp161.dfw.emailsrvr.com (smtp161.dfw.emailsrvr.com [67.192.241.161])
	by lists.alpinelinux.org (Postfix) with ESMTP id 3D4F21EB588
	for <alpine-devel@lists.alpinelinux.org>; Sat,  8 Jan 2011 00:12:46 +0000 (UTC)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by smtp16.relay.dfw1a.emailsrvr.com (SMTP Server) with ESMTP id 645D1403C7;
	Fri,  7 Jan 2011 19:12:46 -0500 (EST)
X-Virus-Scanned: OK
Received: by smtp16.relay.dfw1a.emailsrvr.com (Authenticated sender: mcs-AT-darkregion.net) with ESMTPSA id B7485402F1;
	Fri,  7 Jan 2011 19:12:45 -0500 (EST)
From: Matt Smith <mcs@darkregion.net>
To: alpine-devel@lists.alpinelinux.org
Cc: Matt Smith <mcs@darkregion.net>
Subject: [alpine-devel] [PATCH] abuild: another trivial update to the saveas-* support
Date: Fri,  7 Jan 2011 18:13:45 -0600
Message-Id: <1294445625-15497-1-git-send-email-mcs@darkregion.net>
X-Mailer: git-send-email 1.7.3.3
X-Mailinglist: alpine-devel
Precedence: list
List-Id: Alpine Development <alpine-devel.lists.alpinelinux.org>
List-Unsubscribe: 
	<mailto:alpine-devel+unsubscribe@lists.alpinelinux.org?subject=unsubscribe>
List-Post: <mailto:alpine-devel@lists.alpinelinux.org>
List-Help: <mailto:alpine-devel+help@lists.alpinelinux.org?subject=help>
List-Subscribe: 
	<mailto:alpine-devel+subscribe@lists.alpinelinux.org?subject=subscribe>

I opted for ncopa's method to fix saveas-* URIs, obtained from his sourcecheck()
function, also in abuild.
---
 abuild.in |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/abuild.in b/abuild.in
index 904b1c3..528fba5 100755
--- a/abuild.in
+++ b/abuild.in
@@ -195,9 +195,10 @@ uri_fetch() {
 
 	# fix saveas-*://* URIs
 	case "$uri" in
-		# remove 'saveas-' from beginning and
-		# '/filename' from end of URI
-		saveas-*://*) uri="${uri:7:$(expr ${#uri} - 7 - ${#d} - 1)}";;
+		saveas-*://*)
+			uri=${uri#saveas-}   # remove 'saveas-' from beginning
+			uri=${uri%/*}        # remove '/<filename>' from end
+			;;
 	esac
 
 	# we need GNU wget for this
-- 
1.7.3.3



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---