Magellan Linux

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

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

revision 1647 by niro, Fri Jan 13 13:13:14 2012 UTC revision 1648 by niro, Fri Jan 13 20:51:18 2012 UTC
# Line 2999  pkgsearch() Line 2999  pkgsearch()
2999   local state   local state
3000   local descriptiom   local descriptiom
3001   local homepage   local homepage
3002     local license
3003   local i   local i
3004   local all_installed   local all_installed
3005   local ipver   local ipver
# Line 3035  pkgsearch() Line 3036  pkgsearch()
3036   state="$(get_value_from_magefile STATE ${magefile})"   state="$(get_value_from_magefile STATE ${magefile})"
3037   description="$(get_value_from_magefile DESCRIPTION ${magefile})"   description="$(get_value_from_magefile DESCRIPTION ${magefile})"
3038   homepage="$(get_value_from_magefile HOMEPAGE ${magefile})"   homepage="$(get_value_from_magefile HOMEPAGE ${magefile})"
3039     license="$(get_value_from_magefile LICENSE ${magefile})"
3040    
3041   # all installed   # all installed
3042   for i in $(get_uninstall_candidates --pname ${pname} --pcat ${pcat})   for i in $(get_uninstall_candidates --pname ${pname} --pcat ${pcat})
3043   do   do
3044   ipver="$(magename2pver ${i})"   ipver="$(magename2pver ${i})"
3045   ipbuild="$(magename2pbuild ${i})"   ipbuild="$(magename2pbuild ${i})"
3046    
3047   if [[ -z ${all_installed} ]]   if [[ -z ${all_installed} ]]
3048   then   then
3049   all_installed="${ipver}-${ipbuild}"   all_installed="${ipver}-${ipbuild}"
# Line 3050  pkgsearch() Line 3052  pkgsearch()
3052   fi   fi
3053   done   done
3054   [[ -z ${all_installed} ]] && all_installed="none"   [[ -z ${all_installed} ]] && all_installed="none"
3055    
3056   case ${state} in   case ${state} in
3057   stable) state=${COLGREEN}"[s] ";;   stable) state=${COLGREEN}"[s] ";;
3058   testing) state=${COLYELLOW}"[t] ";;   testing) state=${COLYELLOW}"[t] ";;
# Line 3095  EOF Line 3097  EOF
3097   echo "      Installed versions: ${all_installed}"   echo "      Installed versions: ${all_installed}"
3098   echo "      Description: ${description}"   echo "      Description: ${description}"
3099   echo "      Homepage: ${homepage}"   echo "      Homepage: ${homepage}"
3100     if [[ ! -z ${license} ]]
3101     then
3102     echo "      License:  ${license}"
3103     fi
3104   echo "      Depends: ${deps}"   echo "      Depends: ${deps}"
3105   echo "      SDepends: ${sdeps}"   echo "      SDepends: ${sdeps}"
3106   echo   echo

Legend:
Removed from v.1647  
changed lines
  Added in v.1648