Magellan Linux

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

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

revision 312 by niro, Sun Jan 1 23:15:54 2006 UTC revision 350 by niro, Wed Mar 22 17:43:59 2006 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.13 2006-01-01 23:15:48 niro Exp $  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.17 2006-03-22 17:43:59 niro Exp $
4    
5  mage_setup()  mage_setup()
6  {  {
# Line 381  install_characterdevices() Line 381  install_characterdevices()
381   [ -z "${pathto}" ] && continue   [ -z "${pathto}" ] && continue
382   [[ ${VERBOSE} = on ]] && echo -e "\t>>> CHAR: ${MROOT}${pathto}"   [[ ${VERBOSE} = on ]] && echo -e "\t>>> CHAR: ${MROOT}${pathto}"
383    
384   mknod -m ${posix} -c "${MROOT}${pathto}" ${major} ${minor}   mknod -m ${posix} "${MROOT}${pathto}" c ${major} ${minor}
385   done < ${BUILDDIR}/${pkgname}/.char   done < ${BUILDDIR}/${pkgname}/.char
386    
387   # very important: unsetting the '§' fieldseperator   # very important: unsetting the '§' fieldseperator
# Line 1468  get_uninstall_candidates() Line 1468  get_uninstall_candidates()
1468   shift   shift
1469   done   done
1470    
1471   # sanity checks; abort if not given  # it's not good to complain here about empty pnames; better to continue later anyway
1472   [ -z "${search_pname}" ] && die "get_uninstall_candidates() \$search_pname not given."  # # sanity checks; abort if not given
1473    # [ -z "${search_pname}" ] && die "get_uninstall_candidates() \$search_pname not given."
1474    
1475    
1476   # check needed global vars   # check needed global vars
1477   [ -z "${INSTALLDB}" ] && die "get_uninstall_candidates() \$INSTALLDB not set."   [ -z "${INSTALLDB}" ] && die "get_uninstall_candidates() \$INSTALLDB not set."
1478    
1479   # set pcatdir to '*' if empty   # set pcatdir to '*' if empty
1480   [ -z "${pcatdir}" ] && pcatdir=*   [ -z "${pcatdir}" ] && pcatdir='*'
1481    
1482   for pkg in ${MROOT}${INSTALLDB}/${pcatdir}/*   for pkg in ${MROOT}${INSTALLDB}/${pcatdir}/*
1483   do   do
# Line 1565  virtuals_add() Line 1566  virtuals_add()
1566    
1567   if virtuals_read ${virtualname}   if virtuals_read ${virtualname}
1568   then   then
1569   # make shure ${PKG_NAME} is *not* in ${VIRTUAL_NAME} already   # make sure ${PKG_NAME} is *not* in ${VIRTUAL_NAME} already
1570   for i in $(virtuals_read ${virtualname} showpkgs)   for i in $(virtuals_read ${virtualname} showpkgs)
1571   do   do
1572   if [[ ${i} = ${pkgname} ]]   if [[ ${i} = ${pkgname} ]]
# Line 2541  pkgsearch() Line 2542  pkgsearch()
2542   local ipbuild   local ipbuild
2543    
2544   # only names no versions   # only names no versions
2545   result="$(find ${MAGEDIR} -mindepth 2 -maxdepth 2 -type d -name *${string}*)"   result="$(find ${MAGEDIR} -mindepth 2 -maxdepth 2 -type d -name '*'${string}'*')"
2546   #result="$(find ${MAGEDIR} -type f -name *${string}*.mage | sort)"   #result="$(find ${MAGEDIR} -type f -name '*'${string}'*'.mage | sort)"
2547    
2548   # nothing found   # nothing found
2549   [[ -z ${result} ]] && die "No package found containing '${string}' in the name."   [[ -z ${result} ]] && die "No package found containing '${string}' in the name."
# Line 2627  export_inherits() Line 2628  export_inherits()
2628   shift   shift
2629   done   done
2630  }  }
2631    
2632    mlibdir()
2633    {
2634     local libdir=lib
2635     [[ ${ARCH} = x86_64 ]] && libdir=lib64
2636    
2637     echo "${libdir}"
2638    }

Legend:
Removed from v.312  
changed lines
  Added in v.350