Magellan Linux

  • Back to homepage
    • /[magellan-source]/branches/mage-next/src/smage2.sh

    Diff of /branches/mage-next/src/smage2.sh

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

    revision 1617 by niro, Mon Jan 9 20:13:34 2012 UTC revision 1630 by niro, Fri Jan 13 13:17:21 2012 UTC
    # Line 177  download_sources() Line 177  download_sources()
    177   fi   fi
    178    
    179   echo -e "${COLBLUE}==>${COLGREEN} fetching ${uri}${COLDEFAULT}"   echo -e "${COLBLUE}==>${COLGREEN} fetching ${uri}${COLDEFAULT}"
    180     # always use verbose mode for source downloads
    181     FVERBOSE=off msetfeature "verbose"
    182   # do not die here, mchecksum catches download errors   # do not die here, mchecksum catches download errors
    183   mdownload --uri "${uri}" --dir "${outputdir}"   mdownload --uri "${uri}" --dir "${outputdir}"
    184    
    # Line 1146  step_by_step() Line 1148  step_by_step()
    1148  resume_stamp()  resume_stamp()
    1149  {  {
    1150   local step="$1"   local step="$1"
    1151   touch ${BUILDDIR}/.smage-${PKGNAME}-${step}   [[ ! -d ${BUILDDIR}/.stamps ]] && install -d ${BUILDDIR}/.stamps
    1152     touch ${BUILDDIR}/.stamps/smage-${PKGNAME}-${step}
    1153  }  }
    1154    
    1155  run_resume()  run_resume()
    1156  {  {
    1157   local step="$1"   local step="$1"
    1158    
    1159   if mqueryfeature "resume" && [[ -f ${BUILDDIR}/.smage-${PKGNAME}-${step} ]]   if mqueryfeature "resume" && [[ -f ${BUILDDIR}/.stamps/smage-${PKGNAME}-${step} ]]
    1160   then   then
    1161   echo -e "${COLMAGENTA}${step} already processed; doing nothing${COLDEFAULT}"   echo -e "${COLMAGENTA}${step} already processed; doing nothing${COLDEFAULT}"
    1162   return 0   return 0
    # Line 1486  else Line 1489  else
    1489   rm -rf ${BUILDDIR}/${PKGNAME}   rm -rf ${BUILDDIR}/${PKGNAME}
    1490   fi   fi
    1491    
    1492     # clean up stamps dir
    1493     if [ -d ${BUILDDIR}/.stamps ]
    1494     then
    1495     rm -rf ${BUILDDIR}/.stamps
    1496     fi
    1497    
    1498   # setup build logging   # setup build logging
    1499   [[ ! -d /var/log/smage ]] && install -d /var/log/smage   [[ ! -d /var/log/smage ]] && install -d /var/log/smage
    1500   echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log   echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log
    # Line 1758  else Line 1767  else
    1767   # build src-pkg-tarball if requested   # build src-pkg-tarball if requested
    1768   if mqueryfeature "srcpkg"   if mqueryfeature "srcpkg"
    1769   then   then
    1770   resume_stamp srcpkgbuild || source_pkg_build ${SMAGENAME}   run_resume srcpkgbuild || source_pkg_build ${SMAGENAME}
    1771   resume_stamp srcpkgbuild   resume_stamp srcpkgbuild
    1772   fi   fi
    1773  fi  fi
    Legend:
    Removed from v.1617  
    changed lines
      Added in v.1630