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 1653 by niro, Fri Jan 13 23:17:40 2012 UTC
    # Line 82  mchecksum() Line 82  mchecksum()
    82   return "${retval}"   return "${retval}"
    83  }  }
    84    
    85    mcheckemptydir()
    86    {
    87     local dir="$1"
    88     local retval=1
    89    
    90     if [[ ! -d ${dir} ]]
    91     then
    92     echo "mcheckemptydir(): '${dir}' is not a directory!"
    93     retval=3
    94     else
    95     shopt -s nullglob dotglob
    96     files=( ${dir}/* )
    97     (( ${#files[*]} )) || retval=0
    98     shopt -u nullglob dotglob
    99     fi
    100    
    101     return ${retval}
    102    }
    103    
    104  unpack_packages()  unpack_packages()
    105  {  {
    106   local list="$@"   local list="$@"
    # Line 1579  syncmage_tarball() Line 1598  syncmage_tarball()
    1598   else   else
    1599   echo -ne "${COLBLUE} --- ${COLDEFAULT}"   echo -ne "${COLBLUE} --- ${COLDEFAULT}"
    1600   echo -n "checking md5sum... "   echo -n "checking md5sum... "
    1601   ( 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"
    1602   fi   fi
    1603    
    1604   if [[ -d ${MAGEDIR} ]]   if [[ -d ${MAGEDIR} ]]
    # Line 1645  xtitleclean() Line 1664  xtitleclean()
    1664  }  }
    1665    
    1666    
    1667  # cuts full pathnames or versionized names down to basename  # unused?
    1668  choppkgname()  #
    1669  {  # # cuts full pathnames or versionized names down to basename
    1670   #we want this only if full name was used  # choppkgname()
    1671   if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]  # {
    1672   then  # #we want this only if full name was used
    1673   #cuts ARCH and PBUILD  # if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]
    1674   #ARCH comes from ${MAGERC}  # then
    1675   MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}-r*.::g")  # #cuts ARCH and PBUILD
    1676    # #ARCH comes from ${MAGERC}
    1677    # MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}$(print_distrotag)-r*.::g")
    1678    #
    1679    # #cuts version number
    1680    # MAGENAME=$(basename ${MAGENAME%-*} .mage)
    1681    # fi
    1682    # }
    1683    
      #cuts version number  
      MAGENAME=$(basename ${MAGENAME%-*} .mage)  
      fi  
     }  
    1684    
    1685  # get_categorie $PNAME, returns CATEGORIE  # get_categorie $PNAME, returns CATEGORIE
    1686  # $1=pname  # $1=pname
    # Line 2759  md5sum_packages() Line 2781  md5sum_packages()
    2781   then   then
    2782   echo -ne "${COLBLUE} *** ${COLDEFAULT}"   echo -ne "${COLBLUE} *** ${COLDEFAULT}"
    2783   echo -ne "checking md5sum (${count_current}/${count_total}): "   echo -ne "checking md5sum (${count_current}/${count_total}): "
    2784   ( cd ${PKGDIR}; md5sum -c ${md5file}) || die "md5 for ${pkgfile} failed"   mchecksum --rundir "${PKGDIR}" --file "${md5file}" --method md5 || die "md5 for ${pkgfile} failed"
    2785   else   else
    2786   echo -ne "${COLBLUE} --- ${COLDEFAULT}"   echo -ne "${COLBLUE} --- ${COLDEFAULT}"
    2787   echo -e "!! no md5sum file found for ${pkgfile} :("   echo -e "!! no md5sum file found for ${pkgfile} :("
    # Line 3297  known_mage_feature() Line 3319  known_mage_feature()
    3319   libtool|!libtool) retval=0 ;;   libtool|!libtool) retval=0 ;;
    3320   linuxsymlink|!linuxsymlink) retval=0 ;;   linuxsymlink|!linuxsymlink) retval=0 ;;
    3321   pkgbuild|!pkgbuild) retval=0 ;;   pkgbuild|!pkgbuild) retval=0 ;;
    3322     pkgdistrotag|!pkgdistrotag) retval=0 ;;
    3323   purge|!purge) retval=0 ;;   purge|!purge) retval=0 ;;
    3324   qalint|!qalint) retval=0 ;;   qalint|!qalint) retval=0 ;;
    3325   regentree|!regentree) retval=0 ;;   regentree|!regentree) retval=0 ;;
    Legend:
    Removed from v.1648  
    changed lines
      Added in v.1653