diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2009-01-27 15:48:54 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2009-01-27 15:48:54 +0000 |
| commit | 0bdd70fc94ca425d86fb4878253c69e9b5958e3a (patch) | |
| tree | 1e64ff46a84cf4a4e60fbcc6aa66338b3bb323ac | |
| parent | 4cadcec9f918e6a1058d1e3f1814505bd205c9d4 (diff) | |
| download | simplepkg-0bdd70fc94ca425d86fb4878253c69e9b5958e3a.tar.gz simplepkg-0bdd70fc94ca425d86fb4878253c69e9b5958e3a.tar.bz2 | |
mkbuild: fixing DIST download
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@780 04377dda-e619-0410-9926-eae83683ac58
| -rwxr-xr-x | trunk/src/mkbuild | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild index 45c99fe..03aa080 100755 --- a/trunk/src/mkbuild +++ b/trunk/src/mkbuild @@ -1141,7 +1141,7 @@ function get_file { elif is_writable_folder $TMP; then file="$TMP/`basename $file_name`" if [ ! -e "$file" ]; then - wget "$URL" -O "$file" + wget "$url" -O "$file" if [ "$?" != "0" ]; then echo "Could not download $file" return 1 @@ -1150,7 +1150,7 @@ function get_file { elif ! is_the_same /tmp $TMP; then file="/tmp/`basename $file_name`" if [ ! -e "$file" ]; then - wget "$URL" -O "$file" + wget "$url" -O "$file" if [ "$?" != "0" ]; then echo "Could not download $file" return 1 @@ -1176,7 +1176,7 @@ function get_dist_file { # usage: get_dist_file <url> [file_name] DIST_SRC_LOCATION="" - get_file dist $URL + get_file dist $DIST_SRC_URL DIST_SRC_LOCATION="$DOWNLOADED_FILE_LOCATION" } @@ -1349,9 +1349,12 @@ function get_mkbuild_values { [ -z $SOURCE_NAME ] && SOURCE_NAME=`eval "echo $CONST_STRING"` verbose "SOURCE_NAME=\"$SOURCE_NAME\"" - # Eval source code name + # Eval source code name and URL DIST_SRC_NAME="`eval "echo $CONST_STRING"`" # we need this to strip some escape strings DIST_SRC_NAME="`eval "echo $DIST_SRC_NAME"`" # twice does the job + DIST_SRC_URL="`eval "echo $URL_BASE"`" # we need this to strip some escape strings + DIST_SRC_URL="`eval "echo $DIST_SRC_URL"`" # twice does the job + DIST_SRC_URL="$DIST_SRC_URL/$DIST_SRC_NAME" # Documentations list DEFAULT_DOCFILES="NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING LICENSE SIGNATURE readme.*" |