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 1653 by niro, Fri Jan 13 23:17:40 2012 UTC revision 1690 by niro, Thu Feb 16 12:00:59 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 170  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 413  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 806  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 1564  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 1605  syncmage_tarball() Line 1600  syncmage_tarball()
    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
    Legend:
    Removed from v.1653  
    changed lines
      Added in v.1690