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 1648 by niro, Fri Jan 13 20:51:18 2012 UTC revision 1652 by niro, Fri Jan 13 23:16:36 2012 UTC
    # Line 1579  syncmage_tarball() Line 1579  syncmage_tarball()
    1579   else   else
    1580   echo -ne "${COLBLUE} --- ${COLDEFAULT}"   echo -ne "${COLBLUE} --- ${COLDEFAULT}"
    1581   echo -n "checking md5sum... "   echo -n "checking md5sum... "
    1582   ( cd ${temp}; md5sum -c ${latest_md5} ) || die "md5 for ${latest_tarball} failed"   mchecksum --rundir "${temp}" --file "${latest_md5}" --method md5 || die "md5 for ${latest_tarball} failed"
    1583   fi   fi
    1584    
    1585   if [[ -d ${MAGEDIR} ]]   if [[ -d ${MAGEDIR} ]]
    # Line 1645  xtitleclean() Line 1645  xtitleclean()
    1645  }  }
    1646    
    1647    
    1648  # cuts full pathnames or versionized names down to basename  # unused?
    1649  choppkgname()  #
    1650  {  # # cuts full pathnames or versionized names down to basename
    1651   #we want this only if full name was used  # choppkgname()
    1652   if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]  # {
    1653   then  # #we want this only if full name was used
    1654   #cuts ARCH and PBUILD  # if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]
    1655   #ARCH comes from ${MAGERC}  # then
    1656   MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}-r*.::g")  # #cuts ARCH and PBUILD
    1657    # #ARCH comes from ${MAGERC}
    1658    # MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}$(print_distrotag)-r*.::g")
    1659    #
    1660    # #cuts version number
    1661    # MAGENAME=$(basename ${MAGENAME%-*} .mage)
    1662    # fi
    1663    # }
    1664    
      #cuts version number  
      MAGENAME=$(basename ${MAGENAME%-*} .mage)  
      fi  
     }  
    1665    
    1666  # get_categorie $PNAME, returns CATEGORIE  # get_categorie $PNAME, returns CATEGORIE
    1667  # $1=pname  # $1=pname
    # Line 2759  md5sum_packages() Line 2762  md5sum_packages()
    2762   then   then
    2763   echo -ne "${COLBLUE} *** ${COLDEFAULT}"   echo -ne "${COLBLUE} *** ${COLDEFAULT}"
    2764   echo -ne "checking md5sum (${count_current}/${count_total}): "   echo -ne "checking md5sum (${count_current}/${count_total}): "
    2765   ( cd ${PKGDIR}; md5sum -c ${md5file}) || die "md5 for ${pkgfile} failed"   mchecksum --rundir "${PKGDIR}" --file "${md5file}" --method md5 || die "md5 for ${pkgfile} failed"
    2766   else   else
    2767   echo -ne "${COLBLUE} --- ${COLDEFAULT}"   echo -ne "${COLBLUE} --- ${COLDEFAULT}"
    2768   echo -e "!! no md5sum file found for ${pkgfile} :("   echo -e "!! no md5sum file found for ${pkgfile} :("
    # Line 3297  known_mage_feature() Line 3300  known_mage_feature()
    3300   libtool|!libtool) retval=0 ;;   libtool|!libtool) retval=0 ;;
    3301   linuxsymlink|!linuxsymlink) retval=0 ;;   linuxsymlink|!linuxsymlink) retval=0 ;;
    3302   pkgbuild|!pkgbuild) retval=0 ;;   pkgbuild|!pkgbuild) retval=0 ;;
    3303     pkgdistrotag|!pkgdistrotag) retval=0 ;;
    3304   purge|!purge) retval=0 ;;   purge|!purge) retval=0 ;;
    3305   qalint|!qalint) retval=0 ;;   qalint|!qalint) retval=0 ;;
    3306   regentree|!regentree) retval=0 ;;   regentree|!regentree) retval=0 ;;
    Legend:
    Removed from v.1648  
    changed lines
      Added in v.1652