Magellan Linux

Diff of /trunk/mage/usr/lib/mage/mage4.functions.sh

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

revision 370 by niro, Thu Apr 27 11:52:59 2006 UTC revision 1087 by niro, Mon Jun 28 18:46:57 2010 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.18 2006-04-27 11:52:53 niro Exp $  # $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 $
4    
5  mage_setup()  mage_setup()
6  {  {
# Line 198  install_files() Line 198  install_files()
198   is_config_protected "${pathto}"   is_config_protected "${pathto}"
199   retval="$?"   retval="$?"
200    
201   # 0 - not protected        #   # 0 - not protected         #
202   # 1 - error                #   # 1 - error                 #
203   # 2 - protected            #   # 2 - protected             #
204   # 3 - protected but masked #   # 3 - protected but masked  #
205     # 4 - protected but ignored #
206    
207   case ${retval} in   case ${retval} in
208   # file is not protected - (over)write it   # file is not protected - (over)write it
# Line 252  install_files() Line 253  install_files()
253   (( MAGE_PROTECT_COUNTER++ ))   (( MAGE_PROTECT_COUNTER++ ))
254   export MAGE_PROTECT_COUNTER   export MAGE_PROTECT_COUNTER
255   ;;   ;;
256    
257     # file is protected but ignored, delete the update/do nothing
258     4)
259     if [[ ${VERBOSE} = on ]]
260     then
261     echo -en "${COLRED}"
262     echo -n "! ignr "
263     echo -en "${COLDEFAULT}"
264     echo " === FILE: ${MROOT}${pathto}"
265     fi
266     # simply do nothing here
267     ;;
268   esac   esac
269   done < ${BUILDDIR}/${pkgname}/.files   done < ${BUILDDIR}/${pkgname}/.files
270    
# Line 298  install_symlinks() Line 311  install_symlinks()
311    
312   ln -snf "${link}" "${MROOT}${pathto}"   ln -snf "${link}" "${MROOT}${pathto}"
313    
314   # fix mtime and db  # # fix mtime and db
315   fix_descriptor ${pkgname}/.symlinks \  # fix_descriptor ${pkgname}/.symlinks \
316   "${pathto}" \  # "${pathto}" \
317   "${posix}" \  # "${posix}" \
318   "${link}" \  # "${link}" \
319   "$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \  # "$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
320   "${MROOT}${pathto}")"  # "${MROOT}${pathto}")"
321    
322   done < ${BUILDDIR}/${pkgname}/.symlinks   done < ${BUILDDIR}/${pkgname}/.symlinks
323    
324   # now copy the fixed file over the old one  # # now copy the fixed file over the old one
325   [ -f ${BUILDDIR}/${pkgname}/.symlinks_fixed ] && \  # [ -f ${BUILDDIR}/${pkgname}/.symlinks_fixed ] && \
326   cp -f ${BUILDDIR}/${pkgname}/.symlinks{_fixed,}  # cp -f ${BUILDDIR}/${pkgname}/.symlinks{_fixed,}
327    
328   # very important: unsetting the '§' fieldseperator   # very important: unsetting the '§' fieldseperator
329   IFS=$'\n'   IFS=$'\n'
# Line 809  remove_files() Line 822  remove_files()
822   is_config_protected "${pathto}"   is_config_protected "${pathto}"
823   retval="$?"   retval="$?"
824    
825   # 0 - not protected        #   # 0 - not protected         #
826   # 1 - error                #   # 1 - error                 #
827   # 2 - protected            #   # 2 - protected             #
828   # 3 - protected but masked #   # 3 - protected but masked  #
829     # 4 - protected but ignored #
830    
831   case ${retval} in   case ${retval} in
832   # file is not protected - delete it   # file is not protected - delete it
# Line 831  remove_files() Line 845  remove_files()
845   echo " === FILE: ${MROOT}${pathto}"   echo " === FILE: ${MROOT}${pathto}"
846   fi   fi
847   ;;   ;;
848    
849     # file is protected but ignored, delete the update/do nothing
850     4)
851     if [[ ${VERBOSE} = on ]]
852     then
853     echo -en "${COLRED}"
854     echo -n "! ignr "
855     echo -en "${COLDEFAULT}"
856     echo " === FILE: ${MROOT}${pathto}"
857     fi
858     # simply do nothing here
859     ;;
860   esac   esac
861   ;;   ;;
862   1)   1)
# Line 1106  fetch_packages() Line 1132  fetch_packages()
1132   local count_current   local count_current
1133   local count_total   local count_total
1134    
1135   [ -z "${MIRRORS}" ] && die "You have no mirrors defined. Please edit your /etc/mage.rc."   [ -z "${MIRRORS}" ] && die "You have no mirrors defined. Please edit your ${MAGERC}."
1136    
1137   # get count of total packages   # get count of total packages
1138   declare -i count_current=0   declare -i count_current=0
# Line 1153  fetch_packages() Line 1179  fetch_packages()
1179   echo -e " fetching (${count_current}/${count_total}): ${pkg} ... "   echo -e " fetching (${count_current}/${count_total}): ${pkg} ... "
1180   [[ ${VERBOSE} = off ]] && opt="--quiet"   [[ ${VERBOSE} = off ]] && opt="--quiet"
1181   wget \   wget \
1182   --passive-ftp \   ${WGET_FETCH_OPTIONS} \
  --tries 3 \  
  --continue \  
  --progress bar \  
1183   --directory-prefix=${PKGDIR} \   --directory-prefix=${PKGDIR} \
1184   ${opt} ${mirr}/${PACKAGES_SERVER_PATH}/${pkg}   ${opt} ${mirr}/${PACKAGES_SERVER_PATH}/${pkg}
1185   if [[ $? = 0 ]]   if [[ $? = 0 ]]
# Line 1181  syncmage() Line 1204  syncmage()
1204  {  {
1205   if [ -z "${RSYNC}" ]   if [ -z "${RSYNC}" ]
1206   then   then
1207   die "You have no rsync-mirrors defined. Please edit your /etc/mage.rc."   die "You have no rsync-mirrors defined. Please edit your ${MAGERC}."
1208   fi   fi
1209    
1210   local i   local i
1211   for i in ${RSYNC}   for i in ${RSYNC}
1212   do   do
1213   rsync \   rsync ${RSYNC_FETCH_OPTIONS} ${i} ${MAGEDIR}
  --recursive \  
  --links \  
  --perms \  
  --times \  
  --devices \  
  --timeout=600 \  
  --verbose \  
  --compress \  
  --progress \  
  --stats \  
  --delete \  
  --delete-after \  
  ${i} ${MAGEDIR}  
1214   if [[ $? = 0 ]]   if [[ $? = 0 ]]
1215   then   then
1216   break   break
# Line 1212  syncmage() Line 1222  syncmage()
1222   # clean up backup files (foo~)   # clean up backup files (foo~)
1223   find ${MAGEDIR} -name *~ -exec rm '{}' ';'   find ${MAGEDIR} -name *~ -exec rm '{}' ';'
1224    
1225   # check if an newer mage version is available   # check if a newer mage version is available
1226   is_newer_mage_version_available   is_newer_mage_version_available
1227  }  }
1228    
1229    syncmage_tarball()
1230    {
1231     local latest_tarball
1232     local latest_md5
1233     local temp="$(mktemp -d)"
1234     local mirr mymirr
1235     local opt
1236    
1237     # try to get the md5 marked as latest on the server
1238     latest_md5="mage-latest.md5"
1239    
1240     # try to get the tarball marked as latest on the server
1241     latest_tarball="mage-latest.tar.bz2"
1242    
1243     for mirr in ${MIRRORS}
1244     do
1245     # path without distribution
1246     mymirr="${mirr%/*}"
1247    
1248     echo -ne "${COLBLUE} --- ${COLDEFAULT}"
1249     echo "fetching latest md5 from ${mymirr} ..."
1250     [[ ${VERBOSE} = off ]] && opt="--quiet"
1251     wget \
1252     ${WGET_FETCH_OPTIONS} \
1253     --directory-prefix=${temp} \
1254     ${opt} ${mymirr}/rsync/tarballs/${latest_md5}
1255    
1256     echo -ne "${COLBLUE} --- ${COLDEFAULT}"
1257     echo "fetching latest tarball from ${mymirr} ..."
1258     wget \
1259     ${WGET_FETCH_OPTIONS} \
1260     --directory-prefix=${temp} \
1261     ${opt} ${mymirr}/rsync/tarballs/${latest_tarball}
1262     if [[ $? = 0 ]]
1263     then
1264     break
1265     else
1266     continue
1267     fi
1268     done
1269    
1270     if [[ -f ${temp}/${latest_tarball} ]]
1271     then
1272     # check md5
1273     if [[ ! -f ${temp}/${latest_md5} ]]
1274     then
1275     die "md5 is missing ... aborting"
1276     else
1277     echo -ne "${COLBLUE} --- ${COLDEFAULT}"
1278     echo -n "checking md5sum... "
1279     ( cd ${temp}; md5sum --check ${latest_md5} ) || die "md5 for ${latest_tarball} failed"
1280     fi
1281    
1282     if [[ -d ${MAGEDIR} ]]
1283     then
1284     echo -ne "${COLBLUE} --- ${COLDEFAULT}"
1285     echo "cleaning old mage-tree ${MAGEDIR}..."
1286     rm -rf ${MAGEDIR}
1287     fi
1288    
1289     echo -ne "${COLBLUE} --- ${COLDEFAULT}"
1290     echo "updating mage-tree from tarball ..."
1291     # unpack in dirname of MAGEDIR, as the tarball has already the mage
1292     tar xjmf ${temp}/${latest_tarball} -C ${MAGEDIR%/*} || die "Unpacking tarball"
1293    
1294     if [[ -d ${temp} ]]
1295     then
1296     echo -ne "${COLBLUE} --- ${COLDEFAULT}"
1297     echo "cleaning temp-files ..."
1298     rm -rf ${temp}
1299     fi
1300    
1301     # check if a newer mage version is available
1302     is_newer_mage_version_available
1303     else
1304     die "Could not fetch the latest tarball ... aborting"
1305     fi
1306    }
1307    
1308  cleanpkg()  cleanpkg()
1309  {  {
1310   if [ -d "${PKGDIR}" ]   if [ -d "${PKGDIR}" ]
# Line 1253  choppkgname() Line 1342  choppkgname()
1342   if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]   if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]
1343   then   then
1344   #cuts ARCH and PBUILD   #cuts ARCH and PBUILD
1345   #ARCH comes from /etc/mage.rc   #ARCH comes from ${MAGERC}
1346   MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}-r*.::g")   MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}-r*.::g")
1347    
1348   #cuts version number   #cuts version number
# Line 1328  get_highest_magefile() Line 1417  get_highest_magefile()
1417   local PNAME="$2"   local PNAME="$2"
1418   local magefile   local magefile
1419    
1420   for magefile in $(ls --format=single-column -v ${MAGEDIR}/${PCAT}/${PNAME}/*)   # do not list the content of a directory, only the name (-d)
1421     for magefile in $(ls --format=single-column -v -d ${MAGEDIR}/${PCAT}/${PNAME}/*)
1422   do   do
1423     [[ -z ${magefile} ]] && continue
1424   # we exclude subdirs (for stuff like a md5sum dir)   # we exclude subdirs (for stuff like a md5sum dir)
1425   [ -d ${magefile} ] && continue   [[ -d ${magefile} ]] && continue
1426   if check_stable_package ${magefile}   if check_stable_package ${magefile}
1427   then   then
1428   HIGHEST_MAGEFILE=${magefile}   HIGHEST_MAGEFILE=${magefile}
# Line 1376  get_highest_magefile() Line 1467  get_highest_magefile()
1467  #        1 - error                                #  #        1 - error                                #
1468  #        2 - protected                            #  #        2 - protected                            #
1469  #        3 - protected but masked                 #  #        3 - protected but masked                 #
1470    #        4 - protected but ignored                #
1471  #                                                 #  #                                                 #
1472  ###################################################  ###################################################
1473  is_config_protected()  is_config_protected()
# Line 1384  is_config_protected() Line 1476  is_config_protected()
1476   local TEST   local TEST
1477   local PROTECTED   local PROTECTED
1478   local IFS   local IFS
1479     local i
1480     local x
1481    
1482   EXPFILE="${MROOT}$1"   EXPFILE="${MROOT}$1"
1483    
1484   # file does not exist; it can be written   # file does not exist; it can be written
1485   [ ! -e ${EXPFILE} ] && return 0   [[ ! -e ${EXPFILE} ]] && return 0
1486    
1487   # to be safe; it may be '§'   # to be safe; it may be '§'
1488   IFS=' '   IFS=' '
1489    
1490   # check ob in config protect   # check if config protected
1491   for i in ${CONFIG_PROTECT}   for i in ${CONFIG_PROTECT}
1492   do   do
1493   # ersetzen von $i nur wenn am anfang der variable   # only replace $i in the beginning of the variable
1494   TEST="${EXPFILE/#${MROOT}${i}/Protected}"   TEST="${EXPFILE/#${MROOT}${i}/Protected}"
1495   if [ "${TEST}" != "${EXPFILE}" ]   if [[ ${TEST} != ${EXPFILE} ]]
1496   then   then
1497   # setzen das es protected ist   # file is config proteced
1498   PROTECTED=TRUE   PROTECTED=TRUE
1499    
1500   # check ob nicht doch maskiert   # check if not masked
1501   for x in ${CONFIG_PROTECT_MASK}   for x in ${CONFIG_PROTECT_MASK}
1502   do   do
1503   TEST="${EXPFILE/#${MROOT}${x}/Protect_Masked}"   TEST="${EXPFILE/#${MROOT}${x}/Protect_Masked}"
1504   if [ "${TEST}" != "${EXPFILE}" ]   if [[ ${TEST} != ${EXPFILE} ]]
1505   then   then
1506   PROTECTED=MASKED   PROTECTED=MASKED
1507   fi   fi
1508   done   done
1509    
1510     # check if not ignored
1511     for x in ${CONFIG_PROTECT_IGNORE}
1512     do
1513     TEST="${EXPFILE/#${MROOT}${x}/Protect_Ignored}"
1514     if [[ ${TEST} != ${EXPFILE} ]]
1515     then
1516     PROTECTED=IGNORED
1517     fi
1518     done
1519   fi   fi
1520   done   done
1521    
# Line 1426  is_config_protected() Line 1530  is_config_protected()
1530   #echo "I'm protected, but masked - delete me"   #echo "I'm protected, but masked - delete me"
1531   return 3   return 3
1532   ;;   ;;
1533     IGNORED)
1534     #echo "I'm protected, but ignored - keep me, del update"
1535     return 4
1536     ;;
1537   *)   *)
1538   #echo "delete me"   #echo "delete me"
1539   return 0   return 0
# Line 1443  is_config_protected() Line 1551  is_config_protected()
1551  ###################################################  ###################################################
1552  count_protected_files()  count_protected_files()
1553  {  {
1554   ${MLIBDIR}/writeprotected "$1"   local file="$1"
1555     local dirname="${file%/*}"
1556     local filename="${file##*/}"
1557     local count
1558     local output
1559     local i
1560    
1561     declare -i count=0
1562    
1563     # check if there are already protected files
1564     for oldpretected in $(find ${dirname} -iname "._cfg????_${filename}" |
1565     sed -e "s:\(^.*/\)\(._cfg*_\)\(/.*$\):\1\2\3\%\2\%\3:" |
1566     sort -t'%' -k3 -k2 | cut -f1 -d'%')
1567     do
1568     count=$(echo ${oldpretected} | cut -d_ -f2 | sed -e "s:cfg::")
1569     done
1570     (( count ++ ))
1571    
1572     # fill output up with zeros
1573     for (( i=${#count}; i < 4; i++ )); do output="${output}0"; done
1574     output="${output}${count}"
1575    
1576     echo "${output}"
1577  }  }
1578    
1579  # call with  # call with
# Line 1460  get_uninstall_candidates() Line 1590  get_uninstall_candidates()
1590   local list   local list
1591   local pcatdir   local pcatdir
1592   local protected   local protected
1593     local i
1594    
1595   # very basic getops   # very basic getops
1596   for i in $*   for i in $*
# Line 1721  minclude() Line 1852  minclude()
1852  {  {
1853   local i   local i
1854    
1855   if [ -n "$@" ]   if [[ -n $* ]]
1856   then   then
1857   for i in $@   for i in $*
1858   do   do
1859   [[ ${MAGEDEBUG} = on ]] && \   [[ ${MAGEDEBUG} = on ]] && \
1860   echo "--- Including ${MAGEDIR}/include/${i}.minc"   echo "--- Including ${MAGEDIR}/include/${i}.minc"
# Line 1737  sminclude() Line 1868  sminclude()
1868  {  {
1869   local i   local i
1870    
1871   if [ -n "$@" ]   if [[ -n $* ]]
1872   then   then
1873   for i in $@   for i in $*
1874   do   do
1875   echo "--- Including ${SMAGESCRIPTSDIR}/include/${i}.sminc"   echo "--- Including ${SMAGESCRIPTSDIR}/include/${i}.sminc"
1876   source ${SMAGESCRIPTSDIR}/include/${i}.sminc   source ${SMAGESCRIPTSDIR}/include/${i}.sminc
# Line 1763  is_newer_mage_version_available() Line 1894  is_newer_mage_version_available()
1894   echo -en ${COLRED}"An update for your packetmanager is available. "${COLDEFAULT}   echo -en ${COLRED}"An update for your packetmanager is available. "${COLDEFAULT}
1895   echo -e ${COLBLUE}"[ ${newest_mage} ]"${COLDEFAULT}   echo -e ${COLBLUE}"[ ${newest_mage} ]"${COLDEFAULT}
1896   echo "It is recommened to install this newer version"   echo "It is recommened to install this newer version"
1897   echo "or your current system installation may brake."   echo "or your current system installation may break."
1898   echo   echo
1899   echo -en "Please update mage by running "   echo -en "Please update mage by running "
1900   echo -e ${COLGREEN}"'mage install mage'"${COLDEFAULT}   echo -e ${COLGREEN}"'mage install mage'"${COLDEFAULT}
# Line 2048  get_value_from_magefile() Line 2179  get_value_from_magefile()
2179   local SDEPEND   local SDEPEND
2180   local PROVIDE   local PROVIDE
2181   local PKGTYPE   local PKGTYPE
2182     local MAGE_TARGETS
2183     local SPLIT_PACKAGE_BASE
2184   local preinstall   local preinstall
2185   local postinstall   local postinstall
2186   local preremove   local preremove
# Line 2094  mage_install() Line 2227  mage_install()
2227   local count_current   local count_current
2228   local magefile   local magefile
2229   local src_install   local src_install
2230     local i
2231    
2232   # very basic getops   # very basic getops
2233   for i in $*   for i in $*
# Line 2167  mage_install() Line 2301  mage_install()
2301   echo B:${pbuild}   echo B:${pbuild}
2302   fi   fi
2303    
2304   smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2   if [[ -n ${MAGE_TARGETS} ]]
2305     then
2306     # basic svn compat
2307     if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
2308     then
2309     for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
2310     do
2311     smage2file="${i}"
2312     done
2313     else
2314     smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
2315     fi
2316    
2317     elif [[ -n ${SPLIT_PACKAGE_BASE} ]]
2318     then
2319     # basic svn compat
2320     if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
2321     then
2322     for i in ${SMAGESCRIPTSDIR}/trunk/*/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2
2323     do
2324     smage2file="${i}"
2325     done
2326     else
2327     smage2file=${SMAGESCRIPTSDIR}/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2
2328     fi
2329    
2330     else
2331     # basic svn compat
2332     if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
2333     then
2334     for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname}/${pname}-${pver}-${pbuild}.smage2
2335     do
2336     smage2file="${i}"
2337     done
2338     else
2339     smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
2340     fi
2341     fi
2342    
2343   if [ -f "${smage2file}" ]   if [ -f "${smage2file}" ]
2344   then   then
2345     echo -e " ${COLBLUE}***${COLDEFAULT} building package from source ... "
2346   smage2 ${smage2file} || die "compile failed"   smage2 ${smage2file} || die "compile failed"
2347   else   else
2348   echo   echo
# Line 2183  mage_install() Line 2356  mage_install()
2356   if [[ ${PKGTYPE} != virtual ]] && \   if [[ ${PKGTYPE} != virtual ]] && \
2357   [[ ${PKGTYPE} != sources ]]   [[ ${PKGTYPE} != sources ]]
2358   then   then
2359   # show a verbose message on src-install   echo -e " ${COLBLUE}***${COLDEFAULT} merging files into system ... "
  if [[ ${src_install} = true ]]  
  then  
  echo -ne "${COLBLUE} *** ${COLDEFAULT}"  
  echo -ne "merging files: "  
  echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"  
  echo -e "${COLGREEN}${pname}-${pver}-${pbuild}${COLDEFAULT}"  
  fi  
2360   build_doinstall ${PKGNAME}   build_doinstall ${PKGNAME}
2361   fi   fi
2362    
# Line 2447  mage_uninstall() Line 2613  mage_uninstall()
2613   echo -ne "${COLBLUE} <<< ${COLDEFAULT}"   echo -ne "${COLBLUE} <<< ${COLDEFAULT}"
2614   echo -n "removing: "   echo -n "removing: "
2615   echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"   echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"
2616   echo -e "${COLGREEN}${pname}-${pver}-${pbuild}${COLDEFAULT}"   echo -e "${COLRED}${pname}-${pver}-${pbuild}${COLDEFAULT}"
2617    
2618   magefile="${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"   magefile="${MROOT}${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"
2619   source ${magefile}   source ${magefile}
2620    
2621   ## preremove scripts   ## preremove scripts
# Line 2547  pkgsearch() Line 2713  pkgsearch()
2713   local all_installed   local all_installed
2714   local ipver   local ipver
2715   local ipbuild   local ipbuild
2716     local latest_available
2717     local depsfull
2718     local sdepsfull
2719     local deps
2720     local sdeps
2721     local dep
2722     local sign
2723    
2724   # only names no versions   # only names no versions
2725   result="$(find ${MAGEDIR} -mindepth 2 -maxdepth 2 -type d -name '*'${string}'*')"   result="$(find ${MAGEDIR} -mindepth 2 -maxdepth 2 -type d -name '*'${string}'*'| sed '/profiles/d' | sed '/includes/d')"
2726   #result="$(find ${MAGEDIR} -type f -name '*'${string}'*'.mage | sort)"   #result="$(find ${MAGEDIR} -type f -name '*'${string}'*'.mage | sort)"
2727    
2728   # nothing found   # nothing found
# Line 2564  pkgsearch() Line 2737  pkgsearch()
2737   # get highest version available   # get highest version available
2738   magefile=$(get_highest_magefile ${pcat} ${pname})   magefile=$(get_highest_magefile ${pcat} ${pname})
2739    
2740   # now get all needed infos to print a nice output   if [[ ! -z ${magefile} ]]
2741   pver="$(magename2pver ${magefile})"   then
2742   pbuild="$(magename2pbuild ${magefile})"   # now get all needed infos to print a nice output
2743   state="$(get_value_from_magefile STATE ${magefile})"   pver="$(magename2pver ${magefile})"
2744   description="$(get_value_from_magefile DESCRIPTION ${magefile})"   pbuild="$(magename2pbuild ${magefile})"
2745   homepage="$(get_value_from_magefile HOMEPAGE ${magefile})"   state="$(get_value_from_magefile STATE ${magefile})"
2746     description="$(get_value_from_magefile DESCRIPTION ${magefile})"
2747     homepage="$(get_value_from_magefile HOMEPAGE ${magefile})"
2748    
2749     # all installed
2750     for i in $(get_uninstall_candidates --pname ${pname} --pcat ${pcat})
2751     do
2752     ipver="$(magename2pver ${i})"
2753     ipbuild="$(magename2pbuild ${i})"
2754    
2755     if [[ -z ${all_installed} ]]
2756     then
2757     all_installed="${ipver}-${ipbuild}"
2758     else
2759     all_installed="${all_installed} ${ipver}-${ipbuild}"
2760     fi
2761     done
2762     [[ -z ${all_installed} ]] && all_installed="none"
2763    
2764     case ${state} in
2765     stable) state=${COLGREEN}"[s] ";;
2766     testing) state=${COLYELLOW}"[t] ";;
2767     unstable) state=${COLRED}"[u] ";;
2768     old) state=${COLGRAY}"[o] ";;
2769     esac
2770    
2771   # all installed   latest_available="${pver}-${pbuild}"
2772   for i in $(get_uninstall_candidates --pname ${pname} --pcat ${pcat})   else
2773   do   # package is masked
2774   ipver="$(magename2pver ${i})"   state="${COLRED}[m] "
2775   ipbuild="$(magename2pbuild ${i})"   latest_available="${COLRED}masked for this distribution.${COLDEFAULT}"
2776     fi
2777    
2778   if [[ -z ${all_installed} ]]   depsfull="$(get_value_from_magefile DEPEND ${magefile})"
2779   then   sdepsfull="$(get_value_from_magefile SDEPEND ${magefile})"
  all_installed="${ipver}-${ipbuild}"  
  else  
  all_installed="${all_installed} ${ipver}-${ipbuild}"  
  fi  
  done  
  [[ -z ${all_installed} ]] && all_installed="none"  
2780    
2781   case ${state} in   while read sign dep
2782   stable) state=${COLGREEN}"[s] ";;   do
2783   testing) state=${COLYELLOW}"[t] ";;   case ${dep} in
2784   unstable) state=${COLRED}"[u] ";;   "") continue;;
2785   old) state=${COLGRAY}"[o] ";;   esac
2786   esac  
2787     deps="${deps} $(basename ${dep%-*})"
2788     done << EOF
2789    ${depsfull}
2790    EOF
2791    
2792     while read sign dep
2793     do
2794     case ${dep} in
2795     "") continue;;
2796     esac
2797    
2798     sdeps="${sdeps} $(basename ${dep%-*})"
2799     done << EOF
2800    ${sdepsfull}
2801    EOF
2802    
2803   echo -e "${state}${pcat}/${pname}"${COLDEFAULT}   echo -e "${state}${pcat}/${pname}"${COLDEFAULT}
2804   echo "      Latest available:   ${pver}-${pbuild}"   echo -e "      Latest available:   ${latest_available}"
2805   echo "      Installed versions: ${all_installed}"   echo "      Installed versions: ${all_installed}"
2806   echo "      Description: ${description}"   echo "      Description: ${description}"
2807   echo "      Homepage: ${homepage}"   echo "      Homepage: ${homepage}"
2808     echo "      Depends: ${deps}"
2809     echo "      SDepends: ${sdeps}"
2810   echo   echo
2811    
2812   unset pcat   unset pcat
# Line 2611  pkgsearch() Line 2820  pkgsearch()
2820   unset all_installed   unset all_installed
2821   unset ipver   unset ipver
2822   unset ipbuild   unset ipbuild
2823     unset depsfull
2824     unset sdepsfull
2825     unset deps
2826     unset sdeps
2827     unset dep
2828     unset sign
2829   done   done
2830  }  }
2831    
# Line 2653  blacklisted() Line 2868  blacklisted()
2868   [[ ${USE_UNSTABLE} = true ]] && local MAGE_DISTRIBUTION=unstable   [[ ${USE_UNSTABLE} = true ]] && local MAGE_DISTRIBUTION=unstable
2869   [[ ${USE_TESTING} = true ]] && local MAGE_DISTRIBUTION=testing   [[ ${USE_TESTING} = true ]] && local MAGE_DISTRIBUTION=testing
2870    
2871   local EXCLUDED="${MROOT}/etc/mage-profile/package.blacklist-${ARCH}-${MAGE_DISTRIBUTION}"   # support both types for the moment
2872     if [[ -f /etc/mage-profile/package.blacklist-${ARCH}-${MAGE_DISTRIBUTION} ]]
2873     then
2874     local EXCLUDED="/etc/mage-profile/package.blacklist-${ARCH}-${MAGE_DISTRIBUTION}"
2875     else
2876     local EXCLUDED="/etc/mage-profile/package.blacklist-${ARCH}"
2877     fi
2878    
2879   # return 0 if the list not exist; nothin is masked   # return 0 if the list not exist; nothin is masked
2880   [[ ! -f ${EXCLUDED} ]] && return 0   [[ ! -f ${EXCLUDED} ]] && return 0

Legend:
Removed from v.370  
changed lines
  Added in v.1087