[Lunar-commits] r15720 - lunar/trunk/var/lib/lunar/functions

[Steven Michalske]

Author: hardkrash
Date: 2005-07-13 03:29:17 +0000 (Wed, 13 Jul 2005)
New Revision: 15720

Modified:
   lunar/trunk/var/lib/lunar/functions/download.lunar
Log:
this fix really works


Modified: lunar/trunk/var/lib/lunar/functions/download.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/download.lunar	2005-07-12 22:52:55 UTC (rev 15719)
+++ lunar/trunk/var/lib/lunar/functions/download.lunar	2005-07-13 03:29:17 UTC (rev 15720)
@@ -35,10 +35,12 @@
 
 download_url() {
     local RETVAL
+    local CLEAN_URL
 	debug_msg "download_url($@)"
-	verbose_msg "trying to download \"$URL\""
+	CLEAN_URL=`echo $1 | sed "s:\([^:]/\)/*:\1:g"`
+	verbose_msg "trying to download \"$CLEAN_URL\""
 	connect &&
-	plugin_call SOURCE_DOWNLOAD $1 $2 $3
+	plugin_call SOURCE_DOWNLOAD $CLEAN_URL $2 $3
 	RETVAL=$?
 	if [ $RETVAL == 2 ]; then
 		message "${PROBLEM_COLOR}Warning:${QUERY_COLOR} I don't know how to download \"$1\"${DEFAULT_COLOR}"
@@ -61,8 +63,8 @@
 	# loop over all sources
 	for (( N = 0 ; N < MAX_SOURCES ; N++ )) ; do
 		# get the URL part
-		eval SRC=\$$(echo SOURCE$N | sed s/SOURCE0/SOURCE/ | sed s:\([^:]/\)/*:\1:g )
-		eval URLS=\${$(echo SOURCE${N}_URL | sed s/SOURCE0/SOURCE/ | sed s:\([^:]/\)/*:\1:g )[@]}
+		eval SRC=\$$(echo SOURCE$N | sed s/SOURCE0/SOURCE/ )
+		eval URLS=\${$(echo SOURCE${N}_URL | sed s/SOURCE0/SOURCE/ )[@]}
 
 		# continue (to next) if empty once, break if empty tiwce
 		if [ -z "$SRC" ] ; then