Or just use target variable...

Changed files:
    builder.sh -> 1.594

diff --git a/builder.sh b/builder.sh
index 360eb5f1a73a46a0ad77aeb734d3a89dfd5d7095..64e9d5148d4ea09f42196f7fbc2f796c3174c77c 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -1015,13 +1015,13 @@ get_files() {
                                if echo $i | grep -vE '(http|ftp|https|cvs|svn)://' | grep -qE '\.(gz|bz2)$']; then
                                        echo "Warning: no URL given for $i"
                                fi
+                               target="$fp"
 
                                if [ -z "$NODIST" ] && [ -n "$srcmd5" ]; then
                                        if good_md5 "$i" && good_size "$i"; then
                                                echo "$fp having proper md5sum already exists"
                                                continue
                                        fi
-                                       target="$fp"
 
                                        # optionally prefer mirror over distfiles if there's mirror
                                        # TODO: build url list and then try each url from the list
@@ -1098,12 +1098,11 @@ get_files() {
                                        else
                                                im="$i"
                                        fi
-                                       lf=$(basename $im)
                                        update_shell_title "${GETURI%% *}: $im"
-                                       ${GETURI} "$im" ${OUTFILEOPT} "$lf" || \
+                                       ${GETURI} "$im" ${OUTFILEOPT} "$target" || \
                                        if [ "`echo $im | grep -E 'ftp://'`" ]; then
                                                update_shell_title "${GETURI2%% *}: $im"
-                                               ${GETURI2} "$im" ${OUTFILEOPT} "$lf"
+                                               ${GETURI2} "$im" ${OUTFILEOPT} "$target"
                                        fi
                                fi