Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mage/usr/lib/mage/mage4.functions.sh

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

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

    revision 2270 by niro, Fri Oct 25 07:16:09 2013 UTC revision 2271 by niro, Fri Oct 25 07:28:23 2013 UTC
    # Line 122  mcheckemptydir() Line 122  mcheckemptydir()
    122  unpack_package()  unpack_package()
    123  {  {
    124   local magefile="$1"   local magefile="$1"
    125   local pkg   local pkgname
    126     local pkgfile
    127   local pkgtype   local pkgtype
    128   local tar_opts   local tar_opts
    129    
    130   pkg="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}"   pkgname="$(get_value_from_magefile PKGNAME ${magefile})"
    131     pkgfile="${pkgname}.${PKGSUFFIX}"
    132   pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"   pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"
    133    
    134   xtitle "[ Unpacking ${pkg} ]"   xtitle "[ Unpacking ${pkg} ]"
    # Line 135  unpack_package() Line 137  unpack_package()
    137   if [[ ${pkgtype} = virtual ]]   if [[ ${pkgtype} = virtual ]]
    138   then   then
    139   echo -ne " ${COLBLUE}---${COLDEFAULT}"   echo -ne " ${COLBLUE}---${COLDEFAULT}"
    140   echo " !unpack virtual ${pkg/.${PKGSUFFIX}/} ... "   echo " !unpack virtual ${pkgname} ... "
    141   continue   continue
    142   fi   fi
    143    
    # Line 143  unpack_package() Line 145  unpack_package()
    145   if [[ ${pkgtype} = sources ]]   if [[ ${pkgtype} = sources ]]
    146   then   then
    147   echo -ne " ${COLBLUE}---${COLDEFAULT}"   echo -ne " ${COLBLUE}---${COLDEFAULT}"
    148   echo " !unpack sources ${pkg/.${PKGSUFFIX}/} ... "   echo " !unpack sources ${pkgname} ... "
    149   continue   continue
    150   fi   fi
    151    
    # Line 155  unpack_package() Line 157  unpack_package()
    157   tar_opts="xjmf"   tar_opts="xjmf"
    158   fi   fi
    159    
    160   echo -e " ${COLBLUE}***${COLDEFAULT} unpacking ${pkg} ... "   echo -e " ${COLBLUE}***${COLDEFAULT} unpacking ${pkgfile} ... "
    161   tar ${tar_opts} ${PKGDIR}/${pkg} -C ${BUILDDIR} || die "Unpacking package ${pkg}"   tar ${tar_opts} ${PKGDIR}/${pkgfile} -C ${BUILDDIR} || die "Unpacking package ${pkgfile}"
    162  }  }
    163    
    164  unpack_packages()  unpack_packages()
    # Line 1468  fetch_packages() Line 1470  fetch_packages()
    1470  {  {
    1471   local i   local i
    1472   local list="$@"   local list="$@"
    1473   local pkg   local pkgname
    1474     local pkgfile
    1475   local mirr   local mirr
    1476   local magefile   local magefile
    1477   local md5file   local md5file
    # Line 1490  fetch_packages() Line 1493  fetch_packages()
    1493    
    1494   for magefile in ${list}   for magefile in ${list}
    1495   do   do
    1496   pkg="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}"   pkgname="$(get_value_from_magefile PKGNAME ${magefile})"
    1497     pkgfile="${pkgname}.${PKGSUFFIX}"
    1498   pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"   pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"
    1499    
    1500   (( count_current++ ))   (( count_current++ ))
    1501   xtitle "[ (${count_current}/${count_total}) Fetching ${pkg} ]"   xtitle "[ (${count_current}/${count_total}) Fetching ${pkgfile} ]"
    1502    
    1503   # abort on virtual pkg   # abort on virtual pkg
    1504   if [[ ${pkgtype} = virtual ]]   if [[ ${pkgtype} = virtual ]]
    1505   then   then
    1506   echo -ne " ${COLBLUE}---${COLDEFAULT}"   echo -ne " ${COLBLUE}---${COLDEFAULT}"
    1507   echo " !fetch virtual (${count_current}/${count_total}): ${pkg/.${PKGSUFFIX}/} ... "   echo " !fetch virtual (${count_current}/${count_total}): ${pkgname} ... "
    1508   continue   continue
    1509   fi   fi
    1510    
    # Line 1508  fetch_packages() Line 1512  fetch_packages()
    1512   if [[ ${pkgtype} = sources ]]   if [[ ${pkgtype} = sources ]]
    1513   then   then
    1514   echo -ne " ${COLBLUE}---${COLDEFAULT}"   echo -ne " ${COLBLUE}---${COLDEFAULT}"
    1515   echo " !fetch sources (${count_current}/${count_total}): ${pkg/.${PKGSUFFIX}/} ... "   echo " !fetch sources (${count_current}/${count_total}): ${pkgname} ... "
    1516   continue   continue
    1517   fi   fi
    1518    
    1519   # abort if already exist   # abort if already exist
    1520   if [ -f ${PKGDIR}/${pkg} ]   if [ -f ${PKGDIR}/${pkgfile} ]
    1521   then   then
    1522   echo -ne " ${COLBLUE}***${COLDEFAULT}"   echo -ne " ${COLBLUE}***${COLDEFAULT}"
    1523   echo " fetch complete (${count_current}/${count_total}): ${pkg} ... "   echo " fetch complete (${count_current}/${count_total}): ${pkgfile} ... "
    1524   continue   continue
    1525   fi   fi
    1526    
    1527   echo -ne " ${COLBLUE}***${COLDEFAULT}"   echo -ne " ${COLBLUE}***${COLDEFAULT}"
    1528   echo -e " fetching (${count_current}/${count_total}): ${pkg} ... "   echo -e " fetching (${count_current}/${count_total}): ${pkgfile} ... "
    1529   mdownload --uri "package://${pkg}" --dir "${PKGDIR}" || die "Could not download ${pkg}"   mdownload --uri "package://${pkgfile}" --dir "${PKGDIR}" || die "Could not download ${pkgfile}"
    1530   if [ ! -f ${PKGDIR}/${pkg} ]   if [ ! -f ${PKGDIR}/${pkgfile} ]
    1531   then   then
    1532   die "Package '${pkg}' after download not found in '${PKGDIR}'"   die "Package '${pkgfile}' after download not found in '${PKGDIR}'"
    1533   fi   fi
    1534   done   done
    1535    
    # Line 2803  md5sum_packages() Line 2807  md5sum_packages()
    2807   pname=$(magename2pname ${magefile})   pname=$(magename2pname ${magefile})
    2808   pkgname="$(get_value_from_magefile PKGNAME ${magefile})"   pkgname="$(get_value_from_magefile PKGNAME ${magefile})"
    2809   md5file="${MAGEDIR}/${pcat}/${pname}/md5/${pkgname}.md5"   md5file="${MAGEDIR}/${pcat}/${pname}/md5/${pkgname}.md5"
    2810   pkgfile="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}"   pkgfile="${pkgname}.${PKGSUFFIX}"
    2811   pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"   pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"
    2812    
    2813   (( count_current++ ))   (( count_current++ ))
    # Line 2813  md5sum_packages() Line 2817  md5sum_packages()
    2817   if [[ ${pkgtype} = virtual ]]   if [[ ${pkgtype} = virtual ]]
    2818   then   then
    2819   echo -ne " ${COLBLUE}---${COLDEFAULT}"   echo -ne " ${COLBLUE}---${COLDEFAULT}"
    2820   echo " !md5sum virtual (${count_current}/${count_total}): ${pkgfile/.${PKGSUFFIX}/} ... "   echo " !md5sum virtual (${count_current}/${count_total}): ${pkgname} ... "
    2821   continue   continue
    2822   fi   fi
    2823    
    # Line 2821  md5sum_packages() Line 2825  md5sum_packages()
    2825   if [[ ${pkgtype} = sources ]]   if [[ ${pkgtype} = sources ]]
    2826   then   then
    2827   echo -ne " ${COLBLUE}---${COLDEFAULT}"   echo -ne " ${COLBLUE}---${COLDEFAULT}"
    2828   echo " !md5sum sources (${count_current}/${count_total}): ${pkgfile/.${PKGSUFFIX}/} ... "   echo " !md5sum sources (${count_current}/${count_total}): ${pkgname} ... "
    2829   continue   continue
    2830   fi   fi
    2831    
    Legend:
    Removed from v.2270  
    changed lines
      Added in v.2271