Magellan Linux

Diff of /trunk/mage/usr/lib/mage/mage4.functions.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1083 by niro, Mon Jun 28 18:07:29 2010 UTC revision 1087 by niro, Mon Jun 28 18:46:57 2010 UTC
# Line 1179  fetch_packages() Line 1179  fetch_packages()
1179   echo -e " fetching (${count_current}/${count_total}): ${pkg} ... "   echo -e " fetching (${count_current}/${count_total}): ${pkg} ... "
1180   [[ ${VERBOSE} = off ]] && opt="--quiet"   [[ ${VERBOSE} = off ]] && opt="--quiet"
1181   wget \   wget \
1182   --passive-ftp \   ${WGET_FETCH_OPTIONS} \
  --tries 3 \  
  --continue \  
  --progress bar \  
1183   --directory-prefix=${PKGDIR} \   --directory-prefix=${PKGDIR} \
1184   ${opt} ${mirr}/${PACKAGES_SERVER_PATH}/${pkg}   ${opt} ${mirr}/${PACKAGES_SERVER_PATH}/${pkg}
1185   if [[ $? = 0 ]]   if [[ $? = 0 ]]
# Line 1235  syncmage_tarball() Line 1232  syncmage_tarball()
1232   local latest_md5   local latest_md5
1233   local temp="$(mktemp -d)"   local temp="$(mktemp -d)"
1234   local mirr mymirr   local mirr mymirr
1235     local opt
1236    
1237   # try to get the md5 marked as latest on the server   # try to get the md5 marked as latest on the server
1238   latest_md5="mage-latest.md5"   latest_md5="mage-latest.md5"
# Line 1249  syncmage_tarball() Line 1247  syncmage_tarball()
1247    
1248   echo -ne "${COLBLUE} --- ${COLDEFAULT}"   echo -ne "${COLBLUE} --- ${COLDEFAULT}"
1249   echo "fetching latest md5 from ${mymirr} ..."   echo "fetching latest md5 from ${mymirr} ..."
1250     [[ ${VERBOSE} = off ]] && opt="--quiet"
1251   wget \   wget \
1252   --passive-ftp \   ${WGET_FETCH_OPTIONS} \
  --tries 3 \  
  --continue \  
  --progress bar \  
1253   --directory-prefix=${temp} \   --directory-prefix=${temp} \
1254   ${mymirr}/rsync/tarballs/${latest_md5}   ${opt} ${mymirr}/rsync/tarballs/${latest_md5}
1255    
1256   echo -ne "${COLBLUE} --- ${COLDEFAULT}"   echo -ne "${COLBLUE} --- ${COLDEFAULT}"
1257   echo "fetching latest tarball from ${mymirr} ..."   echo "fetching latest tarball from ${mymirr} ..."
   
1258   wget \   wget \
1259   --passive-ftp \   ${WGET_FETCH_OPTIONS} \
  --tries 3 \  
  --continue \  
  --progress bar \  
1260   --directory-prefix=${temp} \   --directory-prefix=${temp} \
1261   ${mymirr}/rsync/tarballs/${latest_tarball}   ${opt} ${mymirr}/rsync/tarballs/${latest_tarball}
1262   if [[ $? = 0 ]]   if [[ $? = 0 ]]
1263   then   then
1264   break   break
# Line 1282  syncmage_tarball() Line 1274  syncmage_tarball()
1274   then   then
1275   die "md5 is missing ... aborting"   die "md5 is missing ... aborting"
1276   else   else
1277   ( cd ${temp}; md5sum --check ${lastest_md5} ) || die "md5 for ${lastest_tarball} failed"   echo -ne "${COLBLUE} --- ${COLDEFAULT}"
1278     echo -n "checking md5sum... "
1279     ( cd ${temp}; md5sum --check ${latest_md5} ) || die "md5 for ${latest_tarball} failed"
1280   fi   fi
1281    
1282   if [[ -d ${MAGEDIR} ]]   if [[ -d ${MAGEDIR} ]]

Legend:
Removed from v.1083  
changed lines
  Added in v.1087