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 385 by niro, Mon Jul 17 20:48:22 2006 UTC revision 437 by niro, Mon Mar 19 18:05:20 2007 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.20 2006-07-17 20:48:22 niro Exp $  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.27 2007-03-19 18:05:20 niro Exp $
    4    
    5  mage_setup()  mage_setup()
    6  {  {
    # Line 1106  fetch_packages() Line 1106  fetch_packages()
    1106   local count_current   local count_current
    1107   local count_total   local count_total
    1108    
    1109   [ -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}."
    1110    
    1111   # get count of total packages   # get count of total packages
    1112   declare -i count_current=0   declare -i count_current=0
    # Line 1181  syncmage() Line 1181  syncmage()
    1181  {  {
    1182   if [ -z "${RSYNC}" ]   if [ -z "${RSYNC}" ]
    1183   then   then
    1184   die "You have no rsync-mirrors defined. Please edit your /etc/mage.rc."   die "You have no rsync-mirrors defined. Please edit your ${MAGERC}."
    1185   fi   fi
    1186    
    1187   local i   local i
    1188   for i in ${RSYNC}   for i in ${RSYNC}
    1189   do   do
    1190   rsync \   rsync ${RSYNC_FETCH_OPTIONS} ${i} ${MAGEDIR}
      --recursive \  
      --links \  
      --perms \  
      --times \  
      --devices \  
      --timeout=600 \  
      --verbose \  
      --compress \  
      --progress \  
      --stats \  
      --delete \  
      --delete-after \  
      ${i} ${MAGEDIR}  
    1191   if [[ $? = 0 ]]   if [[ $? = 0 ]]
    1192   then   then
    1193   break   break
    # Line 1253  choppkgname() Line 1240  choppkgname()
    1240   if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]   if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]
    1241   then   then
    1242   #cuts ARCH and PBUILD   #cuts ARCH and PBUILD
    1243   #ARCH comes from /etc/mage.rc   #ARCH comes from ${MAGERC}
    1244   MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}-r*.::g")   MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}-r*.::g")
    1245    
    1246   #cuts version number   #cuts version number
    # Line 1721  minclude() Line 1708  minclude()
    1708  {  {
    1709   local i   local i
    1710    
    1711   if [ -n "$@" ]   if [[ -n $* ]]
    1712   then   then
    1713   for i in $@   for i in $*
    1714   do   do
    1715   [[ ${MAGEDEBUG} = on ]] && \   [[ ${MAGEDEBUG} = on ]] && \
    1716   echo "--- Including ${MAGEDIR}/include/${i}.minc"   echo "--- Including ${MAGEDIR}/include/${i}.minc"
    # Line 1737  sminclude() Line 1724  sminclude()
    1724  {  {
    1725   local i   local i
    1726    
    1727   if [ -n "$@" ]   if [[ -n $* ]]
    1728   then   then
    1729   for i in $@   for i in $*
    1730   do   do
    1731   echo "--- Including ${SMAGESCRIPTSDIR}/include/${i}.sminc"   echo "--- Including ${SMAGESCRIPTSDIR}/include/${i}.sminc"
    1732   source ${SMAGESCRIPTSDIR}/include/${i}.sminc   source ${SMAGESCRIPTSDIR}/include/${i}.sminc
    # Line 2441  mage_uninstall() Line 2428  mage_uninstall()
    2428   echo -ne "${COLBLUE} <<< ${COLDEFAULT}"   echo -ne "${COLBLUE} <<< ${COLDEFAULT}"
    2429   echo -n "removing: "   echo -n "removing: "
    2430   echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"   echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"
    2431   echo -e "${COLGREEN}${pname}-${pver}-${pbuild}${COLDEFAULT}"   echo -e "${COLRED}${pname}-${pver}-${pbuild}${COLDEFAULT}"
    2432    
    2433   magefile="${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"   magefile="${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"
    2434   source ${magefile}   source ${magefile}
    # Line 2543  pkgsearch() Line 2530  pkgsearch()
    2530   local ipbuild   local ipbuild
    2531    
    2532   # only names no versions   # only names no versions
    2533   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')"
    2534   #result="$(find ${MAGEDIR} -type f -name '*'${string}'*'.mage | sort)"   #result="$(find ${MAGEDIR} -type f -name '*'${string}'*'.mage | sort)"
    2535    
    2536   # nothing found   # nothing found
    Legend:
    Removed from v.385  
    changed lines
      Added in v.437