--- trunk/mage/usr/lib/mage/mage4.functions.sh 2010/06/28 18:07:29 1083 +++ trunk/mage/usr/lib/mage/mage4.functions.sh 2010/06/28 18:46:57 1087 @@ -1179,10 +1179,7 @@ echo -e " fetching (${count_current}/${count_total}): ${pkg} ... " [[ ${VERBOSE} = off ]] && opt="--quiet" wget \ - --passive-ftp \ - --tries 3 \ - --continue \ - --progress bar \ + ${WGET_FETCH_OPTIONS} \ --directory-prefix=${PKGDIR} \ ${opt} ${mirr}/${PACKAGES_SERVER_PATH}/${pkg} if [[ $? = 0 ]] @@ -1235,6 +1232,7 @@ local latest_md5 local temp="$(mktemp -d)" local mirr mymirr + local opt # try to get the md5 marked as latest on the server latest_md5="mage-latest.md5" @@ -1249,24 +1247,18 @@ echo -ne "${COLBLUE} --- ${COLDEFAULT}" echo "fetching latest md5 from ${mymirr} ..." + [[ ${VERBOSE} = off ]] && opt="--quiet" wget \ - --passive-ftp \ - --tries 3 \ - --continue \ - --progress bar \ + ${WGET_FETCH_OPTIONS} \ --directory-prefix=${temp} \ - ${mymirr}/rsync/tarballs/${latest_md5} + ${opt} ${mymirr}/rsync/tarballs/${latest_md5} echo -ne "${COLBLUE} --- ${COLDEFAULT}" echo "fetching latest tarball from ${mymirr} ..." - wget \ - --passive-ftp \ - --tries 3 \ - --continue \ - --progress bar \ + ${WGET_FETCH_OPTIONS} \ --directory-prefix=${temp} \ - ${mymirr}/rsync/tarballs/${latest_tarball} + ${opt} ${mymirr}/rsync/tarballs/${latest_tarball} if [[ $? = 0 ]] then break @@ -1282,7 +1274,9 @@ then die "md5 is missing ... aborting" else - ( cd ${temp}; md5sum --check ${lastest_md5} ) || die "md5 for ${lastest_tarball} failed" + echo -ne "${COLBLUE} --- ${COLDEFAULT}" + echo -n "checking md5sum... " + ( cd ${temp}; md5sum --check ${latest_md5} ) || die "md5 for ${latest_tarball} failed" fi if [[ -d ${MAGEDIR} ]]