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 2155 by niro, Fri Oct 26 21:14:51 2012 UTC revision 2156 by niro, Wed Aug 14 07:25:43 2013 UTC
    # Line 102  mcheckemptydir() Line 102  mcheckemptydir()
    102   return ${retval}   return ${retval}
    103  }  }
    104    
    105    unpack_package()
    106    {
    107     local magefile="$1"
    108     local pkg
    109     local pkgtype
    110     local tar_opts
    111    
    112     pkg="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}"
    113     pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"
    114    
    115     xtitle "[ Unpacking ${pkg} ]"
    116    
    117     # abort on virtual pkg
    118     if [[ ${pkgtype} = virtual ]]
    119     then
    120     echo -ne " ${COLBLUE}---${COLDEFAULT}"
    121     echo " !unpack virtual ${pkg/.${PKGSUFFIX}/} ... "
    122     continue
    123     fi
    124    
    125     # abort on sources pkg
    126     if [[ ${pkgtype} = sources ]]
    127     then
    128     echo -ne " ${COLBLUE}---${COLDEFAULT}"
    129     echo " !unpack sources ${pkg/.${PKGSUFFIX}/} ... "
    130     continue
    131     fi
    132    
    133     # busybox?
    134     if need_busybox_support tar
    135     then
    136     tar_opts="xjf"
    137     else
    138     tar_opts="xjmf"
    139     fi
    140    
    141     echo -e " ${COLBLUE}***${COLDEFAULT} unpacking ${pkg} ... "
    142     tar ${tar_opts} ${PKGDIR}/${pkg} -C ${BUILDDIR} || die "Unpacking package ${pkg}"
    143    }
    144    
    145  unpack_packages()  unpack_packages()
    146  {  {
    147   local list="$@"   local list="$@"
    148   local magefile   local magefile
      local pkg  
      local pkgtype  
    149   local count_current   local count_current
    150   local count_total   local count_total
    151   local tar_opts   local tar_opts
    # Line 120  unpack_packages() Line 158  unpack_packages()
    158    
    159   for magefile in ${list}   for magefile in ${list}
    160   do   do
    161   pkg="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}"   unpack_package "${magefile}"
      pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"  
       
    162   (( count_current++ ))   (( count_current++ ))
      xtitle "[ (${count_current}/${count_total}) Unpacking ${pkg} ]"  
       
      # abort on virtual pkg  
      if [[ ${pkgtype} = virtual ]]  
      then  
      echo -ne " ${COLBLUE}---${COLDEFAULT}"  
      echo " !unpack virtual (${count_current}/${count_total}): ${pkg/.${PKGSUFFIX}/} ... "  
      continue  
      fi  
       
      # abort on sources pkg  
      if [[ ${pkgtype} = sources ]]  
      then  
      echo -ne " ${COLBLUE}---${COLDEFAULT}"  
      echo " !unpack sources (${count_current}/${count_total}): ${pkg/.${PKGSUFFIX}/} ... "  
      continue  
      fi  
       
      # busybox?  
      if need_busybox_support tar  
      then  
      tar_opts="xjf"  
      else  
      tar_opts="xjmf"  
      fi  
       
      echo -e " ${COLBLUE}***${COLDEFAULT} unpacking (${count_current}/${count_total}): ${pkg} ... "  
      tar ${tar_opts} ${PKGDIR}/${pkg} -C ${BUILDDIR} || die "Unpacking package ${pkg}"  
    163   done   done
    164    
    165   # add a crlf for a better view   # add a crlf for a better view
    # Line 2689  mage_install() Line 2697  mage_install()
    2697   if [[ ${PKGTYPE} != virtual ]] && \   if [[ ${PKGTYPE} != virtual ]] && \
    2698   [[ ${PKGTYPE} != sources ]]   [[ ${PKGTYPE} != sources ]]
    2699   then   then
    2700     unpack_package "${magefile}"
    2701   echo -e " ${COLBLUE}***${COLDEFAULT} merging files into system ... "   echo -e " ${COLBLUE}***${COLDEFAULT} merging files into system ... "
    2702   build_doinstall ${PKGNAME}   build_doinstall ${PKGNAME}
    2703   fi   fi
    Legend:
    Removed from v.2155  
    changed lines
      Added in v.2156