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 1628 by niro, Fri Jan 13 13:13:14 2012 UTC revision 1762 by niro, Sat Feb 18 13:56:34 2012 UTC
    # Line 72  mchecksum() Line 72  mchecksum()
    72   if [[ -d ${rundir} ]]   if [[ -d ${rundir} ]]
    73   then   then
    74   pushd ${rundir} &> /dev/null   pushd ${rundir} &> /dev/null
    75   ${cmd} -c ${file} &> /dev/null   # be verbose here
    76     ${cmd} -c ${file} #&> /dev/null
    77   retval="$?"   retval="$?"
    78   popd &> /dev/null   popd &> /dev/null
    79   else   else
    # Line 82  mchecksum() Line 83  mchecksum()
    83   return "${retval}"   return "${retval}"
    84  }  }
    85    
    86    mcheckemptydir()
    87    {
    88     local dir="$1"
    89     local retval=1
    90    
    91     if [[ ! -d ${dir} ]]
    92     then
    93     echo "mcheckemptydir(): '${dir}' is not a directory!"
    94     retval=3
    95     else
    96     shopt -s nullglob dotglob
    97     files=( ${dir}/* )
    98     (( ${#files[*]} )) || retval=0
    99     shopt -u nullglob dotglob
    100     fi
    101    
    102     return ${retval}
    103    }
    104    
    105  unpack_packages()  unpack_packages()
    106  {  {
    107   local list="$@"   local list="$@"
    # Line 151  fix_mtime() Line 171  fix_mtime()
    171   mtime=$(stat -c %Y "${reference}")   mtime=$(stat -c %Y "${reference}")
    172   touch \   touch \
    173   --no-create \   --no-create \
    174     --no-dereference \
    175   --time=mtime \   --time=mtime \
    176   --reference "${reference}" \   --reference="${reference}" \
    177   "${pathto}"   "${pathto}"
    178    
    179   echo "${mtime}"   echo "${mtime}"
    # Line 394  install_symlinks() Line 415  install_symlinks()
    415    
    416   ln -snf "${link}" "${MROOT}${pathto}"   ln -snf "${link}" "${MROOT}${pathto}"
    417    
    418  # # fix mtime and db   # fix mtime and db
    419  # fix_descriptor ${pkgname}/.symlinks \   fix_descriptor ${pkgname}/.symlinks \
    420  # "${pathto}" \   "${pathto}" \
    421  # "${posix}" \   "${posix}" \
    422  # "${link}" \   "${link}" \
    423  # "$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \   "$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
    424  # "${MROOT}${pathto}")"   "${MROOT}${pathto}")"
    425    
    426   done < ${BUILDDIR}/${pkgname}/.symlinks   done < ${BUILDDIR}/${pkgname}/.symlinks
    427    
    # Line 787  compare_mtime() Line 808  compare_mtime()
    808    
    809   mtime="$(stat -c %Y ${MROOT}${INSTALLDB}/${pfull}/.mtime)"   mtime="$(stat -c %Y ${MROOT}${INSTALLDB}/${pfull}/.mtime)"
    810    
    811   # if $pathto is a symlink than compare linked binary   # no extra handlink for symlinks anymore as fix_mtime
    812   if [ -L "${MROOT}${pathto}" ]   # uses --no-dereference, compare directly
    813   then   x=$(stat -c %Y "${MROOT}${pathto}")
      # readlink -f resolves full path of linked file  
      x="$(readlink -f "${MROOT}${pathto}")"  
       
      # abort if target does not exists  
      # we keep safe here, theoretically the link can removed  
      [ ! -e "${x}" ] && return 1  
       
      x=$(stat -c %Y "${x}")  
      else  
      x=$(stat -c %Y "${MROOT}${pathto}")  
      fi  
    814    
    815   [[ ${mtime} = ${x} ]] && return 0   [[ ${mtime} = ${x} ]] && return 0
    816    
    # Line 1545  syncmage_tarball() Line 1555  syncmage_tarball()
    1555    
    1556   for mirr in ${MIRRORS}   for mirr in ${MIRRORS}
    1557   do   do
    1558   # path without distribution   # path without distribution
    1559   mymirr="${mirr%/*}"   # (only for stable|testing|unstable and not DISTROTAG)
    1560     case ${mirr##*/} in
    1561     stable|testing|unstable) mymirr="${mirr%/*}";;
    1562     *) mymirr="${mirr}";;
    1563     esac
    1564    
    1565   echo -ne "${COLBLUE} --- ${COLDEFAULT}"   echo -ne "${COLBLUE} --- ${COLDEFAULT}"
    1566   echo "fetching latest md5 from ${mymirr} ..."   echo "fetching latest md5 from ${mymirr} ..."
    # Line 1579  syncmage_tarball() Line 1593  syncmage_tarball()
    1593   else   else
    1594   echo -ne "${COLBLUE} --- ${COLDEFAULT}"   echo -ne "${COLBLUE} --- ${COLDEFAULT}"
    1595   echo -n "checking md5sum... "   echo -n "checking md5sum... "
    1596   ( 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"
    1597   fi   fi
    1598    
    1599   if [[ -d ${MAGEDIR} ]]   if [[ -d ${MAGEDIR} ]]
    1600   then   then
    1601   echo -ne "${COLBLUE} --- ${COLDEFAULT}"   echo -ne "${COLBLUE} --- ${COLDEFAULT}"
    1602   echo "cleaning old mage-tree ${MAGEDIR}..."   echo "cleaning old mage-tree ${MAGEDIR}..."
    1603   rm -rf ${MAGEDIR}   # honor mountpoints and empty dirs
    1604     if mountpoint -q ${MAGEDIR}
    1605     then
    1606     if ! mcheckemptydir ${MAGEDIR}
    1607     then
    1608     find ${MAGEDIR} -mindepth 1 -maxdepth 1 | xarg --no-run-if-empty rm -r
    1609     fi
    1610     else
    1611     rm -rf ${MAGEDIR}
    1612     fi
    1613   fi   fi
    1614    
    1615   if need_busybox_support tar   if need_busybox_support tar
    # Line 1645  xtitleclean() Line 1668  xtitleclean()
    1668  }  }
    1669    
    1670    
    1671  # cuts full pathnames or versionized names down to basename  # unused?
    1672  choppkgname()  #
    1673  {  # # cuts full pathnames or versionized names down to basename
    1674   #we want this only if full name was used  # choppkgname()
    1675   if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]  # {
    1676   then  # #we want this only if full name was used
    1677   #cuts ARCH and PBUILD  # if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]
    1678   #ARCH comes from ${MAGERC}  # then
    1679   MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}-r*.::g")  # #cuts ARCH and PBUILD
    1680    # #ARCH comes from ${MAGERC}
    1681    # MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}$(print_distrotag)-r*.::g")
    1682    #
    1683    # #cuts version number
    1684    # MAGENAME=$(basename ${MAGENAME%-*} .mage)
    1685    # fi
    1686    # }
    1687    
      #cuts version number  
      MAGENAME=$(basename ${MAGENAME%-*} .mage)  
      fi  
     }  
    1688    
    1689  # get_categorie $PNAME, returns CATEGORIE  # get_categorie $PNAME, returns CATEGORIE
    1690  # $1=pname  # $1=pname
    # Line 1844  count_protected_files() Line 1870  count_protected_files()
    1870   local filename="${file##*/}"   local filename="${file##*/}"
    1871   local count   local count
    1872   local output   local output
    1873     local oldprotected
    1874   local i   local i
    1875     local x
    1876    
    1877     # hack; do not honor a global set IFS like '§'
    1878     local IFS
    1879    
    1880   declare -i count=0   count=0
    1881    
    1882   # check if there are already protected files   # check if there are already protected files
    1883   for oldpretected in $(find ${dirname} -iname "._cfg????_${filename}" |   for oldprotected in $(find ${dirname} -iname "._cfg????_${filename}" |
    1884   sed -e "s:\(^.*/\)\(._cfg*_\)\(/.*$\):\1\2\3\%\2\%\3:" |   sed -e "s:\(^.*/\)\(._cfg*_\)\(/.*$\):\1\2\3\%\2\%\3:" |
    1885   sort -t'%' -k3 -k2 | cut -f1 -d'%')   sort -t'%' -k3 -k2 | cut -f1 -d'%')
    1886   do   do
    1887   count=$(echo ${oldpretected} | cut -d_ -f2 | sed -e "s:cfg::")   count="$(echo ${oldprotected} | sed 's:.*\/._cfg\(.*\)_.*:\1:')"
    1888   done   done
    1889   (( count ++ ))  
    1890     # dirty hack to convert 0001 -> 1; 0120 -> 120 etc
    1891     x="${#count}"
    1892     for (( i=0; i<x; i++ ))
    1893     do
    1894     if [[ ${count:${i}:1} != 0 ]]
    1895     then
    1896     count="${count:${i}}"
    1897     break
    1898     fi
    1899     done
    1900    
    1901     count="$(( ${count}+1 ))"
    1902    
    1903   # fill output up with zeros   # fill output up with zeros
    1904   for (( i=${#count}; i < 4; i++ )); do output="${output}0"; done   for (( i=${#count}; i < 4; i++ )); do output="${output}0"; done
    # Line 2759  md5sum_packages() Line 2802  md5sum_packages()
    2802   then   then
    2803   echo -ne "${COLBLUE} *** ${COLDEFAULT}"   echo -ne "${COLBLUE} *** ${COLDEFAULT}"
    2804   echo -ne "checking md5sum (${count_current}/${count_total}): "   echo -ne "checking md5sum (${count_current}/${count_total}): "
    2805   ( cd ${PKGDIR}; md5sum -c ${md5file}) || die "md5 for ${pkgfile} failed"   mchecksum --rundir "${PKGDIR}" --file "${md5file}" --method md5 || die "md5 for ${pkgfile} failed"
    2806   else   else
    2807   echo -ne "${COLBLUE} --- ${COLDEFAULT}"   echo -ne "${COLBLUE} --- ${COLDEFAULT}"
    2808   echo -e "!! no md5sum file found for ${pkgfile} :("   echo -e "!! no md5sum file found for ${pkgfile} :("
    # Line 2999  pkgsearch() Line 3042  pkgsearch()
    3042   local state   local state
    3043   local descriptiom   local descriptiom
    3044   local homepage   local homepage
    3045     local license
    3046   local i   local i
    3047   local all_installed   local all_installed
    3048   local ipver   local ipver
    # Line 3035  pkgsearch() Line 3079  pkgsearch()
    3079   state="$(get_value_from_magefile STATE ${magefile})"   state="$(get_value_from_magefile STATE ${magefile})"
    3080   description="$(get_value_from_magefile DESCRIPTION ${magefile})"   description="$(get_value_from_magefile DESCRIPTION ${magefile})"
    3081   homepage="$(get_value_from_magefile HOMEPAGE ${magefile})"   homepage="$(get_value_from_magefile HOMEPAGE ${magefile})"
    3082     license="$(get_value_from_magefile LICENSE ${magefile})"
    3083    
    3084   # all installed   # all installed
    3085   for i in $(get_uninstall_candidates --pname ${pname} --pcat ${pcat})   for i in $(get_uninstall_candidates --pname ${pname} --pcat ${pcat})
    3086   do   do
    3087   ipver="$(magename2pver ${i})"   ipver="$(magename2pver ${i})"
    3088   ipbuild="$(magename2pbuild ${i})"   ipbuild="$(magename2pbuild ${i})"
    3089    
    3090   if [[ -z ${all_installed} ]]   if [[ -z ${all_installed} ]]
    3091   then   then
    3092   all_installed="${ipver}-${ipbuild}"   all_installed="${ipver}-${ipbuild}"
    # Line 3050  pkgsearch() Line 3095  pkgsearch()
    3095   fi   fi
    3096   done   done
    3097   [[ -z ${all_installed} ]] && all_installed="none"   [[ -z ${all_installed} ]] && all_installed="none"
    3098    
    3099   case ${state} in   case ${state} in
    3100   stable) state=${COLGREEN}"[s] ";;   stable) state=${COLGREEN}"[s] ";;
    3101   testing) state=${COLYELLOW}"[t] ";;   testing) state=${COLYELLOW}"[t] ";;
    # Line 3095  EOF Line 3140  EOF
    3140   echo "      Installed versions: ${all_installed}"   echo "      Installed versions: ${all_installed}"
    3141   echo "      Description: ${description}"   echo "      Description: ${description}"
    3142   echo "      Homepage: ${homepage}"   echo "      Homepage: ${homepage}"
    3143     if [[ ! -z ${license} ]]
    3144     then
    3145     echo "      License:  ${license}"
    3146     fi
    3147   echo "      Depends: ${deps}"   echo "      Depends: ${deps}"
    3148   echo "      SDepends: ${sdeps}"   echo "      SDepends: ${sdeps}"
    3149   echo   echo
    # Line 3291  known_mage_feature() Line 3340  known_mage_feature()
    3340   libtool|!libtool) retval=0 ;;   libtool|!libtool) retval=0 ;;
    3341   linuxsymlink|!linuxsymlink) retval=0 ;;   linuxsymlink|!linuxsymlink) retval=0 ;;
    3342   pkgbuild|!pkgbuild) retval=0 ;;   pkgbuild|!pkgbuild) retval=0 ;;
    3343     pkgdistrotag|!pkgdistrotag) retval=0 ;;
    3344   purge|!purge) retval=0 ;;   purge|!purge) retval=0 ;;
    3345   qalint|!qalint) retval=0 ;;   qalint|!qalint) retval=0 ;;
    3346   regentree|!regentree) retval=0 ;;   regentree|!regentree) retval=0 ;;
    Legend:
    Removed from v.1628  
    changed lines
      Added in v.1762