Magellan Linux

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

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

revision 449 by niro, Tue Mar 27 16:35:57 2007 UTC revision 603 by niro, Mon Nov 5 19:36:36 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.29 2007-03-27 16:35:57 niro Exp $  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.34 2007-11-05 19:34:36 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 1430  is_config_protected() Line 1430  is_config_protected()
1430  ###################################################  ###################################################
1431  count_protected_files()  count_protected_files()
1432  {  {
1433   ${MLIBDIR}/writeprotected "$1"   local file="$1"
1434     local dirname="${file%/*}"
1435     local filename="${file##*/}"
1436     local count
1437     local output
1438     local i
1439    
1440     declare -i count=0
1441    
1442     # check if there are already protected files
1443     for oldpretected in $(find ${dirname} -iname "._cfg????_${filename}" |
1444     sed -e "s:\(^.*/\)\(._cfg*_\)\(/.*$\):\1\2\3\%\2\%\3:" |
1445     sort -t'%' -k3 -k2 | cut -f1 -d'%')
1446     do
1447     count=$(echo ${oldpretected} | cut -d_ -f2 | sed -e "s:cfg::")
1448     done
1449     (( count ++ ))
1450    
1451     # fill output up with zeros
1452     for (( i=${#count}; i < 4; i++ )); do output="${output}0"; done
1453     output="${output}${count}"
1454    
1455     echo "${output}"
1456  }  }
1457    
1458  # call with  # call with
# Line 2431  mage_uninstall() Line 2453  mage_uninstall()
2453   echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"   echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"
2454   echo -e "${COLRED}${pname}-${pver}-${pbuild}${COLDEFAULT}"   echo -e "${COLRED}${pname}-${pver}-${pbuild}${COLDEFAULT}"
2455    
2456   magefile="${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"   magefile="${MROOT}${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"
2457   source ${magefile}   source ${magefile}
2458    
2459   ## preremove scripts   ## preremove scripts
# Line 2530  pkgsearch() Line 2552  pkgsearch()
2552   local ipver   local ipver
2553   local ipbuild   local ipbuild
2554   local latest_available   local latest_available
2555     local depsfull
2556     local sdepsfull
2557     local deps
2558     local sdeps
2559     local dep
2560     local sign
2561    
2562   # only names no versions   # only names no versions
2563   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 2585  pkgsearch() Line 2613  pkgsearch()
2613   latest_available="${COLRED}masked for this distribution.${COLDEFAULT}"   latest_available="${COLRED}masked for this distribution.${COLDEFAULT}"
2614   fi   fi
2615    
2616     depsfull="$(get_value_from_magefile DEPEND ${magefile})"
2617     sdepsfull="$(get_value_from_magefile SDEPEND ${magefile})"
2618    
2619     while read sign dep
2620     do
2621     case ${dep} in
2622     "") continue;;
2623     esac
2624    
2625     deps="${deps} $(basename ${dep%-*})"
2626     done << EOF
2627    ${depsfull}
2628    EOF
2629    
2630     while read sign dep
2631     do
2632     case ${dep} in
2633     "") continue;;
2634     esac
2635    
2636     sdeps="${sdeps} $(basename ${dep%-*})"
2637     done << EOF
2638    ${sdepsfull}
2639    EOF
2640    
2641   echo -e "${state}${pcat}/${pname}"${COLDEFAULT}   echo -e "${state}${pcat}/${pname}"${COLDEFAULT}
2642   echo -e "      Latest available:   ${latest_available}"   echo -e "      Latest available:   ${latest_available}"
2643   echo "      Installed versions: ${all_installed}"   echo "      Installed versions: ${all_installed}"
2644   echo "      Description: ${description}"   echo "      Description: ${description}"
2645   echo "      Homepage: ${homepage}"   echo "      Homepage: ${homepage}"
2646     echo "      Depends: ${deps}"
2647     echo "      SDepends: ${sdeps}"
2648   echo   echo
2649    
2650   unset pcat   unset pcat
# Line 2603  pkgsearch() Line 2658  pkgsearch()
2658   unset all_installed   unset all_installed
2659   unset ipver   unset ipver
2660   unset ipbuild   unset ipbuild
2661     unset depsfull
2662     unset sdepsfull
2663     unset deps
2664     unset sdeps
2665     unset dep
2666     unset sign
2667   done   done
2668  }  }
2669    

Legend:
Removed from v.449  
changed lines
  Added in v.603