Magellan Linux

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

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

revision 445 by niro, Mon Mar 19 20:00:35 2007 UTC revision 458 by niro, Tue Apr 10 09:21:55 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.28 2007-03-19 20:00:35 niro Exp $  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.31 2007-04-10 09:21:55 niro Exp $
4    
5  mage_setup()  mage_setup()
6  {  {
# Line 1375  is_config_protected() Line 1375  is_config_protected()
1375   EXPFILE="${MROOT}$1"   EXPFILE="${MROOT}$1"
1376    
1377   # file does not exist; it can be written   # file does not exist; it can be written
1378   [ ! -e ${EXPFILE} ] && return 0   [[ ! -e ${EXPFILE} ]] && return 0
1379    
1380   # to be safe; it may be '§'   # to be safe; it may be '§'
1381   IFS=' '   IFS=' '
# Line 1385  is_config_protected() Line 1385  is_config_protected()
1385   do   do
1386   # ersetzen von $i nur wenn am anfang der variable   # ersetzen von $i nur wenn am anfang der variable
1387   TEST="${EXPFILE/#${MROOT}${i}/Protected}"   TEST="${EXPFILE/#${MROOT}${i}/Protected}"
1388   if [ "${TEST}" != "${EXPFILE}" ]   if [[ ${TEST} != ${EXPFILE} ]]
1389   then   then
1390   # setzen das es protected ist   # setzen das es protected ist
1391   PROTECTED=TRUE   PROTECTED=TRUE
# Line 1394  is_config_protected() Line 1394  is_config_protected()
1394   for x in ${CONFIG_PROTECT_MASK}   for x in ${CONFIG_PROTECT_MASK}
1395   do   do
1396   TEST="${EXPFILE/#${MROOT}${x}/Protect_Masked}"   TEST="${EXPFILE/#${MROOT}${x}/Protect_Masked}"
1397   if [ "${TEST}" != "${EXPFILE}" ]   if [[ ${TEST} != ${EXPFILE} ]]
1398   then   then
1399   PROTECTED=MASKED   PROTECTED=MASKED
1400   fi   fi
# Line 1447  get_uninstall_candidates() Line 1447  get_uninstall_candidates()
1447   local list   local list
1448   local pcatdir   local pcatdir
1449   local protected   local protected
1450     local i
1451    
1452   # very basic getops   # very basic getops
1453   for i in $*   for i in $*
# Line 2529  pkgsearch() Line 2530  pkgsearch()
2530   local ipver   local ipver
2531   local ipbuild   local ipbuild
2532   local latest_available   local latest_available
2533     local depsfull
2534     local sdepsfull
2535     local deps
2536     local sdeps
2537     local dep
2538     local sign
2539    
2540   # only names no versions   # only names no versions
2541   result="$(find ${MAGEDIR} -mindepth 2 -maxdepth 2 -type d -name '*'${string}'*'| sed '/profiles/d' | sed '/includes/d')"   result="$(find ${MAGEDIR} -mindepth 2 -maxdepth 2 -type d -name '*'${string}'*'| sed '/profiles/d' | sed '/includes/d')"
# Line 2584  pkgsearch() Line 2591  pkgsearch()
2591   latest_available="${COLRED}masked for this distribution.${COLDEFAULT}"   latest_available="${COLRED}masked for this distribution.${COLDEFAULT}"
2592   fi   fi
2593    
2594     depsfull="$(get_value_from_magefile DEPEND ${magefile})"
2595     sdepsfull="$(get_value_from_magefile SDEPEND ${magefile})"
2596    
2597     while read sign dep
2598     do
2599     case ${dep} in
2600     "") continue;;
2601     esac
2602    
2603     deps="${deps} $(basename ${dep%-*})"
2604     done << EOF
2605    ${depsfull}
2606    EOF
2607    
2608     while read sign dep
2609     do
2610     case ${dep} in
2611     "") continue;;
2612     esac
2613    
2614     sdeps="${sdeps} $(basename ${dep%-*})"
2615     done << EOF
2616    ${sdepsfull}
2617    EOF
2618    
2619   echo -e "${state}${pcat}/${pname}"${COLDEFAULT}   echo -e "${state}${pcat}/${pname}"${COLDEFAULT}
2620   echo -e "      Latest available:   ${latest_available}"   echo -e "      Latest available:   ${latest_available}"
2621   echo "      Installed versions: ${all_installed}"   echo "      Installed versions: ${all_installed}"
2622   echo "      Description: ${description}"   echo "      Description: ${description}"
2623   echo "      Homepage: ${homepage}"   echo "      Homepage: ${homepage}"
2624     echo "      Depends: ${deps}"
2625     echo "      SDepends: ${sdeps}"
2626   echo   echo
2627    
2628   unset pcat   unset pcat
# Line 2602  pkgsearch() Line 2636  pkgsearch()
2636   unset all_installed   unset all_installed
2637   unset ipver   unset ipver
2638   unset ipbuild   unset ipbuild
2639     unset depsfull
2640     unset sdepsfull
2641     unset deps
2642     unset sdeps
2643     unset dep
2644     unset sign
2645   done   done
2646  }  }
2647    

Legend:
Removed from v.445  
changed lines
  Added in v.458