Magellan Linux

  • Back to homepage
    • /[magellan-source]/branches/mage-next/src/mage4.functions.sh

    Diff of /branches/mage-next/src/mage4.functions.sh

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 1627 by niro, Fri Jan 13 13:10:08 2012 UTC revision 2272 by niro, Fri Oct 25 07:31:51 2013 UTC
    # Line 1  Line 1 
    1  #!/bin/bash  #!/bin/bash
    2  # Magellan Linux Installer Functions (mage.functions.sh)  # Magellan Linux Installer Functions (mage.functions.sh)
    3  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.38 2008-10-05 10:32:24 niro Exp $  # $Id$
    4    
    5  COLRED="\033[1;6m\033[31m"  COLRED="\033[1;6m\033[31m"
    6  COLGREEN="\033[1;6m\033[32m"  COLGREEN="\033[1;6m\033[32m"
    # Line 46  mchecksum() Line 46  mchecksum()
    46   local method   local method
    47   local cmd   local cmd
    48   local retval   local retval
    49     local sum
    50     local dest
    51    
    52   # very basic getops   # very basic getops
    53   for i in $*   for i in $*
    # Line 72  mchecksum() Line 74  mchecksum()
    74   if [[ -d ${rundir} ]]   if [[ -d ${rundir} ]]
    75   then   then
    76   pushd ${rundir} &> /dev/null   pushd ${rundir} &> /dev/null
    77   ${cmd} -c ${file} &> /dev/null  
    78   retval="$?"   # all file must be non-zero
    79     retval=0
    80     while read sum dest
    81     do
    82     if [ ! -s ${dest} ]
    83     then
    84     echo "${dest}: file is empty ;("
    85     retval=127
    86     fi
    87     done < ${file}
    88     if [[ ${retval} != 127 ]]
    89     then
    90     # be verbose here
    91     ${cmd} -c ${file} #&> /dev/null
    92     retval="$?"
    93     fi
    94    
    95   popd &> /dev/null   popd &> /dev/null
    96   else   else
    97   retval=1   retval=1
    # Line 82  mchecksum() Line 100  mchecksum()
    100   return "${retval}"   return "${retval}"
    101  }  }
    102    
    103    mcheckemptydir()
    104    {
    105     local dir="$1"
    106     local retval=1
    107    
    108     if [[ ! -d ${dir} ]]
    109     then
    110     echo "mcheckemptydir(): '${dir}' is not a directory!"
    111     retval=3
    112     else
    113     shopt -s nullglob dotglob
    114     files=( ${dir}/* )
    115     (( ${#files[*]} )) || retval=0
    116     shopt -u nullglob dotglob
    117     fi
    118    
    119     return ${retval}
    120    }
    121    
    122    unpack_package()
    123    {
    124     local magefile="$1"
    125     local pkgname
    126     local pkgfile
    127     local pkgtype
    128     local tar_opts
    129    
    130     pkgname="$(get_value_from_magefile PKGNAME ${magefile})"
    131     pkgfile="${pkgname}.${PKGSUFFIX}"
    132     pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"
    133    
    134     xtitle "[ Unpacking ${pkg} ]"
    135    
    136     # abort on virtual pkg
    137     if [[ ${pkgtype} = virtual ]]
    138     then
    139     echo -ne " ${COLBLUE}---${COLDEFAULT}"
    140     echo " !unpack virtual ${pkgname} ... "
    141     continue
    142     fi
    143    
    144     # abort on sources pkg
    145     if [[ ${pkgtype} = sources ]]
    146     then
    147     echo -ne " ${COLBLUE}---${COLDEFAULT}"
    148     echo " !unpack sources ${pkgname} ... "
    149     continue
    150     fi
    151    
    152     # busybox?
    153     if need_busybox_support tar
    154     then
    155     tar_opts="xjf"
    156     else
    157     tar_opts="xjmf"
    158     fi
    159    
    160     echo -e " ${COLBLUE}***${COLDEFAULT} unpacking ${pkgfile} ... "
    161     tar ${tar_opts} ${PKGDIR}/${pkgfile} -C ${BUILDDIR} || die "Unpacking package ${pkgfile}"
    162    }
    163    
    164  unpack_packages()  unpack_packages()
    165  {  {
    166   local list="$@"   local list="$@"
    167   local magefile   local magefile
      local pkg  
      local pkgtype  
    168   local count_current   local count_current
    169   local count_total   local count_total
    170   local tar_opts   local tar_opts
    # Line 100  unpack_packages() Line 177  unpack_packages()
    177    
    178   for magefile in ${list}   for magefile in ${list}
    179   do   do
    180   pkg="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}"   unpack_package "${magefile}"
      pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"  
       
    181   (( 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}"  
    182   done   done
    183    
    184   # add a crlf for a better view   # add a crlf for a better view
    # Line 151  fix_mtime() Line 198  fix_mtime()
    198   mtime=$(stat -c %Y "${reference}")   mtime=$(stat -c %Y "${reference}")
    199   touch \   touch \
    200   --no-create \   --no-create \
    201     --no-dereference \
    202   --time=mtime \   --time=mtime \
    203   --reference "${reference}" \   --reference="${reference}" \
    204   "${pathto}"   "${pathto}"
    205    
    206   echo "${mtime}"   echo "${mtime}"
    # Line 394  install_symlinks() Line 442  install_symlinks()
    442    
    443   ln -snf "${link}" "${MROOT}${pathto}"   ln -snf "${link}" "${MROOT}${pathto}"
    444    
    445  # # fix mtime and db   # fix mtime and db
    446  # fix_descriptor ${pkgname}/.symlinks \   fix_descriptor ${pkgname}/.symlinks \
    447  # "${pathto}" \   "${pathto}" \
    448  # "${posix}" \   "${posix}" \
    449  # "${link}" \   "${link}" \
    450  # "$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \   "$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
    451  # "${MROOT}${pathto}")"   "${MROOT}${pathto}")"
    452    
    453   done < ${BUILDDIR}/${pkgname}/.symlinks   done < ${BUILDDIR}/${pkgname}/.symlinks
    454    
    # Line 787  compare_mtime() Line 835  compare_mtime()
    835    
    836   mtime="$(stat -c %Y ${MROOT}${INSTALLDB}/${pfull}/.mtime)"   mtime="$(stat -c %Y ${MROOT}${INSTALLDB}/${pfull}/.mtime)"
    837    
    838   # if $pathto is a symlink than compare linked binary   # no extra handlink for symlinks anymore as fix_mtime
    839   if [ -L "${MROOT}${pathto}" ]   # uses --no-dereference, compare directly
    840   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  
    841    
    842   [[ ${mtime} = ${x} ]] && return 0   [[ ${mtime} = ${x} ]] && return 0
    843    
    # Line 1366  convertmirrors() Line 1403  convertmirrors()
    1403   output+="${mirror}${addon}/${uri/${scheme}/}"   output+="${mirror}${addon}/${uri/${scheme}/}"
    1404   done   done
    1405   else   else
    1406   output="${uri}"   output="${uri}"
    1407   fi   fi
    1408    
    1409   echo "${output}"   echo "${output}"
    # Line 1433  fetch_packages() Line 1470  fetch_packages()
    1470  {  {
    1471   local i   local i
    1472   local list="$@"   local list="$@"
    1473   local pkg   local pkgname
    1474     local pkgfile
    1475     local pcat
    1476     local pname
    1477   local mirr   local mirr
    1478   local magefile   local magefile
    1479   local md5file   local md5file
    # Line 1441  fetch_packages() Line 1481  fetch_packages()
    1481   local count_current   local count_current
    1482   local count_total   local count_total
    1483   local wget_opts   local wget_opts
    1484     local fetching
    1485    
    1486   [ -z "${MIRRORS}" ] && die "You have no mirrors defined. Please edit your ${MAGERC}."   [ -z "${MIRRORS}" ] && die "You have no mirrors defined. Please edit your ${MAGERC}."
    1487    
    # Line 1455  fetch_packages() Line 1496  fetch_packages()
    1496    
    1497   for magefile in ${list}   for magefile in ${list}
    1498   do   do
    1499   pkg="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}"   pkgname="$(get_value_from_magefile PKGNAME ${magefile})"
    1500     pkgfile="${pkgname}.${PKGSUFFIX}"
    1501   pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"   pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"
    1502    
    1503     pcat=$(magename2pcat ${magefile})
    1504     pname=$(magename2pname ${magefile})
    1505     md5file="${MAGEDIR}/${pcat}/${pname}/md5/${pkgname}.md5"
    1506    
    1507   (( count_current++ ))   (( count_current++ ))
    1508   xtitle "[ (${count_current}/${count_total}) Fetching ${pkg} ]"   xtitle "[ (${count_current}/${count_total}) Fetching ${pkgfile} ]"
    1509    
    1510   # abort on virtual pkg   # abort on virtual pkg
    1511   if [[ ${pkgtype} = virtual ]]   if [[ ${pkgtype} = virtual ]]
    1512   then   then
    1513   echo -ne " ${COLBLUE}---${COLDEFAULT}"   echo -ne " ${COLBLUE}---${COLDEFAULT}"
    1514   echo " !fetch virtual (${count_current}/${count_total}): ${pkg/.${PKGSUFFIX}/} ... "   echo " !fetch virtual (${count_current}/${count_total}): ${pkgname} ... "
    1515   continue   continue
    1516   fi   fi
    1517    
    # Line 1473  fetch_packages() Line 1519  fetch_packages()
    1519   if [[ ${pkgtype} = sources ]]   if [[ ${pkgtype} = sources ]]
    1520   then   then
    1521   echo -ne " ${COLBLUE}---${COLDEFAULT}"   echo -ne " ${COLBLUE}---${COLDEFAULT}"
    1522   echo " !fetch sources (${count_current}/${count_total}): ${pkg/.${PKGSUFFIX}/} ... "   echo " !fetch sources (${count_current}/${count_total}): ${pkgname} ... "
    1523   continue   continue
    1524   fi   fi
    1525    
    1526   # abort if already exist   # check if FETCHING is required
    1527   if [ -f ${PKGDIR}/${pkg} ]   if [ ! -f "${md5file}" ]
    1528     then
    1529     fetching=true
    1530     else
    1531     if mchecksum --rundir "${PKGDIR}" --file "${md5file}" --method md5 &> /dev/null
    1532     then
    1533     # md5's ok, no fetching required
    1534     fetching=false
    1535     else
    1536     fetching=true
    1537     fi
    1538     fi
    1539    
    1540     if [[ ${fetching} = false ]]
    1541   then   then
    1542   echo -ne " ${COLBLUE}***${COLDEFAULT}"   echo -ne " ${COLBLUE}***${COLDEFAULT}"
    1543   echo " fetch complete (${count_current}/${count_total}): ${pkg} ... "   echo " fetch complete (${count_current}/${count_total}): ${pkgfile} ... "
    1544   continue   continue
    1545     else
    1546     echo -ne " ${COLBLUE}***${COLDEFAULT}"
    1547     echo -e " fetching (${count_current}/${count_total}): ${pkgfile} ... "
    1548     mdownload --uri "package://${pkgfile}" --dir "${PKGDIR}" || die "Could not download ${pkgfile}"
    1549   fi   fi
    1550    
    1551   echo -ne " ${COLBLUE}***${COLDEFAULT}"   # sanity check, not really needed but to be sure
    1552   echo -e " fetching (${count_current}/${count_total}): ${pkg} ... "   if [ ! -f ${PKGDIR}/${pkgfile} ]
      mdownload --uri "package://${pkg}" --dir "${PKGDIR}" || die "Could not download ${pkg}"  
      if [ ! -f ${PKGDIR}/${pkg} ]  
    1553   then   then
    1554   die "Package '${pkg}' after download not found in '${PKGDIR}'"   die "Package '${pkgfile}' after download not found in '${PKGDIR}'"
    1555   fi   fi
    1556   done   done
    1557    
    # Line 1545  syncmage_tarball() Line 1606  syncmage_tarball()
    1606    
    1607   for mirr in ${MIRRORS}   for mirr in ${MIRRORS}
    1608   do   do
    1609   # path without distribution   # path without distribution
    1610   mymirr="${mirr%/*}"   # (only for stable|testing|unstable and not DISTROTAG)
    1611     case ${mirr##*/} in
    1612     stable|testing|unstable) mymirr="${mirr%/*}";;
    1613     *) mymirr="${mirr}";;
    1614     esac
    1615    
    1616   echo -ne "${COLBLUE} --- ${COLDEFAULT}"   echo -ne "${COLBLUE} --- ${COLDEFAULT}"
    1617   echo "fetching latest md5 from ${mymirr} ..."   echo "fetching latest md5 from ${mymirr} ..."
    # Line 1579  syncmage_tarball() Line 1644  syncmage_tarball()
    1644   else   else
    1645   echo -ne "${COLBLUE} --- ${COLDEFAULT}"   echo -ne "${COLBLUE} --- ${COLDEFAULT}"
    1646   echo -n "checking md5sum... "   echo -n "checking md5sum... "
    1647   ( 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"
    1648   fi   fi
    1649    
    1650   if [[ -d ${MAGEDIR} ]]   if [[ -d ${MAGEDIR} ]]
    1651   then   then
    1652   echo -ne "${COLBLUE} --- ${COLDEFAULT}"   echo -ne "${COLBLUE} --- ${COLDEFAULT}"
    1653   echo "cleaning old mage-tree ${MAGEDIR}..."   echo "cleaning old mage-tree ${MAGEDIR}..."
    1654   rm -rf ${MAGEDIR}   # honor mountpoints and empty dirs
    1655     if mountpoint -q ${MAGEDIR}
    1656     then
    1657     if ! mcheckemptydir ${MAGEDIR}
    1658     then
    1659     find ${MAGEDIR} -mindepth 1 -maxdepth 1 | xargs --no-run-if-empty rm -r
    1660     fi
    1661     else
    1662     rm -rf ${MAGEDIR}
    1663     fi
    1664   fi   fi
    1665    
    1666   if need_busybox_support tar   if need_busybox_support tar
    # Line 1645  xtitleclean() Line 1719  xtitleclean()
    1719  }  }
    1720    
    1721    
    1722  # cuts full pathnames or versionized names down to basename  # unused?
    1723  choppkgname()  #
    1724  {  # # cuts full pathnames or versionized names down to basename
    1725   #we want this only if full name was used  # choppkgname()
    1726   if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]  # {
    1727   then  # #we want this only if full name was used
    1728   #cuts ARCH and PBUILD  # if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]
    1729   #ARCH comes from ${MAGERC}  # then
    1730   MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}-r*.::g")  # #cuts ARCH and PBUILD
    1731    # #ARCH comes from ${MAGERC}
    1732    # MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}$(print_distrotag)-r*.::g")
    1733    #
    1734    # #cuts version number
    1735    # MAGENAME=$(basename ${MAGENAME%-*} .mage)
    1736    # fi
    1737    # }
    1738    
      #cuts version number  
      MAGENAME=$(basename ${MAGENAME%-*} .mage)  
      fi  
     }  
    1739    
    1740  # get_categorie $PNAME, returns CATEGORIE  # get_categorie $PNAME, returns CATEGORIE
    1741  # $1=pname  # $1=pname
    # Line 1737  get_highest_magefile() Line 1814  get_highest_magefile()
    1814   then   then
    1815   HIGHEST_MAGEFILE=${magefile}   HIGHEST_MAGEFILE=${magefile}
    1816   #for debug only   #for debug only
    1817   mqueryfeature "debug" && echo "HIGHEST_MAGEFILE=${HIGHEST_MAGEFILE}"   mqueryfeature "debug" && echo "HIGHEST_MAGEFILE=${HIGHEST_MAGEFILE}" >&2
    1818   fi   fi
    1819   done   done
    1820    
    # Line 1844  count_protected_files() Line 1921  count_protected_files()
    1921   local filename="${file##*/}"   local filename="${file##*/}"
    1922   local count   local count
    1923   local output   local output
    1924     local oldprotected
    1925   local i   local i
    1926     local x
    1927    
    1928     # hack; do not honor a global set IFS like '§'
    1929     local IFS
    1930    
    1931   declare -i count=0   count=0
    1932    
    1933   # check if there are already protected files   # check if there are already protected files
    1934   for oldpretected in $(find ${dirname} -iname "._cfg????_${filename}" |   for oldprotected in $(find ${dirname} -iname "._cfg????_${filename}" |
    1935   sed -e "s:\(^.*/\)\(._cfg*_\)\(/.*$\):\1\2\3\%\2\%\3:" |   sed -e "s:\(^.*/\)\(._cfg*_\)\(/.*$\):\1\2\3\%\2\%\3:" |
    1936   sort -t'%' -k3 -k2 | cut -f1 -d'%')   sort -t'%' -k3 -k2 | cut -f1 -d'%')
    1937   do   do
    1938   count=$(echo ${oldpretected} | cut -d_ -f2 | sed -e "s:cfg::")   count="$(echo ${oldprotected} | sed 's:.*\/._cfg\(.*\)_.*:\1:')"
    1939   done   done
    1940   (( count ++ ))  
    1941     # convert 0001 -> 1; 0120 -> 120 etc
    1942     # use bash internal base functions to this task
    1943     x="$((10#${count}))"
    1944     for (( i=0; i<x; i++ ))
    1945     do
    1946     if [[ ${count:${i}:1} != 0 ]]
    1947     then
    1948     count="${count:${i}}"
    1949     break
    1950     fi
    1951     done
    1952    
    1953     count="$(( ${count}+1 ))"
    1954    
    1955   # fill output up with zeros   # fill output up with zeros
    1956   for (( i=${#count}; i < 4; i++ )); do output="${output}0"; done   for (( i=${#count}; i < 4; i++ )); do output="${output}0"; done
    # Line 2645  mage_install() Line 2740  mage_install()
    2740   if [[ ${PKGTYPE} != virtual ]] && \   if [[ ${PKGTYPE} != virtual ]] && \
    2741   [[ ${PKGTYPE} != sources ]]   [[ ${PKGTYPE} != sources ]]
    2742   then   then
    2743     unpack_package "${magefile}"
    2744   echo -e " ${COLBLUE}***${COLDEFAULT} merging files into system ... "   echo -e " ${COLBLUE}***${COLDEFAULT} merging files into system ... "
    2745   build_doinstall ${PKGNAME}   build_doinstall ${PKGNAME}
    2746   fi   fi
    # Line 2733  md5sum_packages() Line 2829  md5sum_packages()
    2829   pname=$(magename2pname ${magefile})   pname=$(magename2pname ${magefile})
    2830   pkgname="$(get_value_from_magefile PKGNAME ${magefile})"   pkgname="$(get_value_from_magefile PKGNAME ${magefile})"
    2831   md5file="${MAGEDIR}/${pcat}/${pname}/md5/${pkgname}.md5"   md5file="${MAGEDIR}/${pcat}/${pname}/md5/${pkgname}.md5"
    2832   pkgfile="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}"   pkgfile="${pkgname}.${PKGSUFFIX}"
    2833   pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"   pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"
    2834    
    2835   (( count_current++ ))   (( count_current++ ))
    # Line 2743  md5sum_packages() Line 2839  md5sum_packages()
    2839   if [[ ${pkgtype} = virtual ]]   if [[ ${pkgtype} = virtual ]]
    2840   then   then
    2841   echo -ne " ${COLBLUE}---${COLDEFAULT}"   echo -ne " ${COLBLUE}---${COLDEFAULT}"
    2842   echo " !md5sum virtual (${count_current}/${count_total}): ${pkgfile/.${PKGSUFFIX}/} ... "   echo " !md5sum virtual (${count_current}/${count_total}): ${pkgname} ... "
    2843   continue   continue
    2844   fi   fi
    2845    
    # Line 2751  md5sum_packages() Line 2847  md5sum_packages()
    2847   if [[ ${pkgtype} = sources ]]   if [[ ${pkgtype} = sources ]]
    2848   then   then
    2849   echo -ne " ${COLBLUE}---${COLDEFAULT}"   echo -ne " ${COLBLUE}---${COLDEFAULT}"
    2850   echo " !md5sum sources (${count_current}/${count_total}): ${pkgfile/.${PKGSUFFIX}/} ... "   echo " !md5sum sources (${count_current}/${count_total}): ${pkgname} ... "
    2851   continue   continue
    2852   fi   fi
    2853    
    # Line 2759  md5sum_packages() Line 2855  md5sum_packages()
    2855   then   then
    2856   echo -ne "${COLBLUE} *** ${COLDEFAULT}"   echo -ne "${COLBLUE} *** ${COLDEFAULT}"
    2857   echo -ne "checking md5sum (${count_current}/${count_total}): "   echo -ne "checking md5sum (${count_current}/${count_total}): "
    2858   ( cd ${PKGDIR}; md5sum -c ${md5file}) || die "md5 for ${pkgfile} failed"   mchecksum --rundir "${PKGDIR}" --file "${md5file}" --method md5 || die "md5 for ${pkgfile} failed"
    2859   else   else
    2860   echo -ne "${COLBLUE} --- ${COLDEFAULT}"   echo -ne "${COLBLUE} --- ${COLDEFAULT}"
    2861   echo -e "!! no md5sum file found for ${pkgfile} :("   echo -e "!! no md5sum file found for ${pkgfile} :("
    # Line 2799  uninstall_packages() Line 2895  uninstall_packages()
    2895   pbuild=$(magename2pbuild ${pkg})   pbuild=$(magename2pbuild ${pkg})
    2896   can_pcat="${pcat}"   can_pcat="${pcat}"
    2897   can_pname="${pname}"   can_pname="${pname}"
    2898    
    2899   if [ -z "${can_ver_list}" ]   if [ -z "${can_ver_list}" ]
    2900   then   then
    2901   can_ver_list=" ${pver}-${pbuild}"   can_ver_list=" ${pver}-${pbuild}"
    # Line 2999  pkgsearch() Line 3095  pkgsearch()
    3095   local state   local state
    3096   local descriptiom   local descriptiom
    3097   local homepage   local homepage
    3098     local license
    3099   local i   local i
    3100   local all_installed   local all_installed
    3101   local ipver   local ipver
    # Line 3035  pkgsearch() Line 3132  pkgsearch()
    3132   state="$(get_value_from_magefile STATE ${magefile})"   state="$(get_value_from_magefile STATE ${magefile})"
    3133   description="$(get_value_from_magefile DESCRIPTION ${magefile})"   description="$(get_value_from_magefile DESCRIPTION ${magefile})"
    3134   homepage="$(get_value_from_magefile HOMEPAGE ${magefile})"   homepage="$(get_value_from_magefile HOMEPAGE ${magefile})"
    3135     license="$(get_value_from_magefile LICENSE ${magefile})"
    3136    
    3137   # all installed   # all installed
    3138   for i in $(get_uninstall_candidates --pname ${pname} --pcat ${pcat})   for i in $(get_uninstall_candidates --pname ${pname} --pcat ${pcat})
    3139   do   do
    3140   ipver="$(magename2pver ${i})"   ipver="$(magename2pver ${i})"
    3141   ipbuild="$(magename2pbuild ${i})"   ipbuild="$(magename2pbuild ${i})"
    3142    
    3143   if [[ -z ${all_installed} ]]   if [[ -z ${all_installed} ]]
    3144   then   then
    3145   all_installed="${ipver}-${ipbuild}"   all_installed="${ipver}-${ipbuild}"
    # Line 3050  pkgsearch() Line 3148  pkgsearch()
    3148   fi   fi
    3149   done   done
    3150   [[ -z ${all_installed} ]] && all_installed="none"   [[ -z ${all_installed} ]] && all_installed="none"
    3151    
    3152   case ${state} in   case ${state} in
    3153   stable) state=${COLGREEN}"[s] ";;   stable) state=${COLGREEN}"[s] ";;
    3154   testing) state=${COLYELLOW}"[t] ";;   testing) state=${COLYELLOW}"[t] ";;
    # Line 3074  pkgsearch() Line 3172  pkgsearch()
    3172   "") continue;;   "") continue;;
    3173   esac   esac
    3174    
    3175   deps="${deps} $(basename ${dep%-*})"   if [[ -z ${deps} ]]
    3176     then
    3177     deps="$(basename ${dep%-*})"
    3178     else
    3179     deps="${deps} $(basename ${dep%-*})"
    3180     fi
    3181   done << EOF   done << EOF
    3182  ${depsfull}  ${depsfull}
    3183  EOF  EOF
    # Line 3085  EOF Line 3188  EOF
    3188   "") continue;;   "") continue;;
    3189   esac   esac
    3190    
    3191   sdeps="${sdeps} $(basename ${dep%-*})"   if [[ -z ${sdeps} ]]
    3192     then
    3193     sdeps="$(basename ${dep%-*})"
    3194     else
    3195     sdeps="${sdeps} $(basename ${dep%-*})"
    3196     fi
    3197   done << EOF   done << EOF
    3198  ${sdepsfull}  ${sdepsfull}
    3199  EOF  EOF
    # Line 3095  EOF Line 3203  EOF
    3203   echo "      Installed versions: ${all_installed}"   echo "      Installed versions: ${all_installed}"
    3204   echo "      Description: ${description}"   echo "      Description: ${description}"
    3205   echo "      Homepage: ${homepage}"   echo "      Homepage: ${homepage}"
    3206   echo "      Depends: ${deps}"   if [[ ! -z ${license} ]]
    3207     then
    3208     echo "      License:  ${license}"
    3209     fi
    3210     echo "      Depends:  ${deps}"
    3211   echo "      SDepends: ${sdeps}"   echo "      SDepends: ${sdeps}"
    3212   echo   echo
    3213    
    # Line 3212  EOF Line 3324  EOF
    3324  need_busybox_support()  need_busybox_support()
    3325  {  {
    3326   local cmd   local cmd
    3327     local busybox
    3328   cmd="$1"   cmd="$1"
    3329    
    3330   if [[ -x /bin/busybox ]]   for busybox in {,/usr}/bin/busybox
    3331   then   do
    3332   if [[ $(readlink $(which ${cmd})) = /bin/busybox ]]   if [[ -x ${busybox} ]]
    3333   then   then
    3334   # needs busybox support   if [[ $(readlink $(type -P ${cmd})) = ${busybox} ]]
    3335   return 0   then
    3336     # needs busybox support
    3337     return 0
    3338     fi
    3339   fi   fi
    3340   fi   done
    3341    
    3342   # no busybox   # no busybox
    3343   return 1   return 1
    # Line 3278  known_mage_feature() Line 3394  known_mage_feature()
    3394  {  {
    3395   local feature="$1"   local feature="$1"
    3396   local retval   local retval
    3397    
    3398   case "${feature}" in   case "${feature}" in
    3399   autosvc|!autosvc) retval=0 ;;   autosvc|!autosvc) retval=0 ;;
    3400   buildlog|!buildlog) retval=0 ;;   buildlog|!buildlog) retval=0 ;;
    # Line 3287  known_mage_feature() Line 3403  known_mage_feature()
    3403   compressdoc|!compressdoc) retval=0 ;;   compressdoc|!compressdoc) retval=0 ;;
    3404   debug|!debug) retval=0 ;;   debug|!debug) retval=0 ;;
    3405   distcc|!distcc) retval=0 ;;   distcc|!distcc) retval=0 ;;
    3406     icecc|!icecc) retval=0 ;;
    3407   kernelsrcunpack|!kernelsrcunpack) retval=0 ;;   kernelsrcunpack|!kernelsrcunpack) retval=0 ;;
    3408   libtool|!libtool) retval=0 ;;   libtool|!libtool) retval=0 ;;
    3409   linuxsymlink|!linuxsymlink) retval=0 ;;   linuxsymlink|!linuxsymlink) retval=0 ;;
    3410   pkgbuild|!pkgbuild) retval=0 ;;   pkgbuild|!pkgbuild) retval=0 ;;
    3411     pkgdistrotag|!pkgdistrotag) retval=0 ;;
    3412   purge|!purge) retval=0 ;;   purge|!purge) retval=0 ;;
    3413   qalint|!qalint) retval=0 ;;   qalint|!qalint) retval=0 ;;
    3414   regentree|!regentree) retval=0 ;;   regentree|!regentree) retval=0 ;;
    # Line 3329  msetfeature() Line 3447  msetfeature()
    3447    
    3448   if ! known_mage_feature "${feature}"   if ! known_mage_feature "${feature}"
    3449   then   then
    3450   [[ ${FVERBOSE} = off ]] || echo "unknown feature ${feature}, ignoring it"   [[ ${FVERBOSE} = off ]] || echo -e "${COLRED}Unknown feature '${feature}', ignoring it${COLDEFAULT}"
    3451   return 3   return 3
    3452   fi   fi
    3453    
    # Line 3382  mqueryfeature() Line 3500  mqueryfeature()
    3500   fi   fi
    3501   done   done
    3502   else   else
    3503     [[ ${FVERBOSE} = off ]] || echo -e "${COLRED}Unknown feature '${feature}', ignoring it${COLDEFAULT}"
    3504   retval=3   retval=3
    3505   fi   fi
    3506    
    # Line 3390  mqueryfeature() Line 3509  mqueryfeature()
    3509    
    3510  mprintfeatures()  mprintfeatures()
    3511  {  {
    3512   echo "Global features:  ${MAGE_FEATURES_GLOBAL[*]}"   echo -e "${COLRED}Global features:${COLDEFAULT} ${MAGE_FEATURES_GLOBAL[*]}"
    3513   echo "Local features:   ${MAGE_FEATURES[*]}"   echo -e "${COLYELLOW}Local features:${COLDEFAULT} ${MAGE_FEATURES[*]}"
    3514   echo "Current features: ${MAGE_FEATURES_CURRENT[*]}"   echo -e "${COLGREEN}Current features:${COLDEFAULT} ${MAGE_FEATURES_CURRENT[*]}"
    3515  }  }
    Legend:
    Removed from v.1627  
    changed lines
      Added in v.2272