Magellan Linux

  • Back to homepage
    • /[magellan-source]/branches/mage-next/src/mage4.functions.sh

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

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

    revision 1625 by niro, Fri Jan 13 13:06:13 2012 UTC revision 1649 by niro, Fri Jan 13 21:04:02 2012 UTC
    # Line 1401  mdownload() Line 1401  mdownload()
    1401   real_uris="$(convertmirrors ${uri})"   real_uris="$(convertmirrors ${uri})"
    1402    
    1403   # verbose or not   # verbose or not
    1404   mqueryfeature "!verbose" && wget_opts="--quiet"   mqueryfeature "!verbose" && wget_opts+=" --quiet"
    1405    
    1406   # filter wget options if busybox was found   # filter wget options if busybox was found
    1407   wget_opts="$(busybox_filter_wget_options ${WGET_FETCH_OPTIONS})"   wget_opts+=" $(busybox_filter_wget_options ${WGET_FETCH_OPTIONS})"
    1408    
    1409   # create outputdir   # create outputdir
    1410   [[ ! -d ${outputdir} ]] && install -d "${outputdir}"   [[ ! -d ${outputdir} ]] && install -d "${outputdir}"
    # Line 1653  choppkgname() Line 1653  choppkgname()
    1653   then   then
    1654   #cuts ARCH and PBUILD   #cuts ARCH and PBUILD
    1655   #ARCH comes from ${MAGERC}   #ARCH comes from ${MAGERC}
    1656   MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}-r*.::g")   MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}$(print_distrotag)-r*.::g")
    1657    
    1658   #cuts version number   #cuts version number
    1659   MAGENAME=$(basename ${MAGENAME%-*} .mage)   MAGENAME=$(basename ${MAGENAME%-*} .mage)
    # 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
    # Line 3285  known_mage_feature() Line 3291  known_mage_feature()
    3291   ccache|!ccache) retval=0 ;;   ccache|!ccache) retval=0 ;;
    3292   check|!check) retval=0 ;;   check|!check) retval=0 ;;
    3293   compressdoc|!compressdoc) retval=0 ;;   compressdoc|!compressdoc) retval=0 ;;
    3294     debug|!debug) retval=0 ;;
    3295   distcc|!distcc) retval=0 ;;   distcc|!distcc) retval=0 ;;
    3296   kernelsrcunpack|!kernelsrcunpack) retval=0 ;;   kernelsrcunpack|!kernelsrcunpack) retval=0 ;;
    3297   libtool|!libtool) retval=0 ;;   libtool|!libtool) retval=0 ;;
    3298   linuxsymlink|!linuxsymlink) retval=0 ;;   linuxsymlink|!linuxsymlink) retval=0 ;;
    3299   pkgbuild|!pkgbuild) retval=0 ;;   pkgbuild|!pkgbuild) retval=0 ;;
    3300     pkgdistrotag|!pkgdistrotag) retval=0 ;;
    3301   purge|!purge) retval=0 ;;   purge|!purge) retval=0 ;;
    3302   qalint|!qalint) retval=0 ;;   qalint|!qalint) retval=0 ;;
    3303   regentree|!regentree) retval=0 ;;   regentree|!regentree) retval=0 ;;
    3304   resume|!resume) retval=0 ;;   resume|!resume) retval=0 ;;
      stepbystep|!stepbystep) retval=0 ;;  
    3305   srcpkgbuild|!srcpkgbuild) retval=0 ;;   srcpkgbuild|!srcpkgbuild) retval=0 ;;
    3306   srcpkgtarball|!srcpkgtarball) retval=0 ;;   srcpkgtarball|!srcpkgtarball) retval=0 ;;
    3307     static|!static) retval=0 ;;
    3308     stepbystep|!stepbystep) retval=0 ;;
    3309   strip|!strip) retval=0 ;;   strip|!strip) retval=0 ;;
    3310     verbose|!verbose) retval=0 ;;
    3311   *) retval=1 ;;   *) retval=1 ;;
    3312   esac   esac
    3313    
    # Line 3326  msetfeature() Line 3336  msetfeature()
    3336    
    3337   if ! known_mage_feature "${feature}"   if ! known_mage_feature "${feature}"
    3338   then   then
    3339   [[ ${FVERBOSE} = off ]] || echo "unknown feature ${feature}, ignoring it"   [[ ${FVERBOSE} = off ]] || echo -e "${COLRED}Unknown feature '${feature}', ignoring it${COLDEFAULT}"
    3340   return 3   return 3
    3341   fi   fi
    3342    
    # Line 3379  mqueryfeature() Line 3389  mqueryfeature()
    3389   fi   fi
    3390   done   done
    3391   else   else
    3392     [[ ${FVERBOSE} = off ]] || echo -e "${COLRED}Unknown feature '${feature}', ignoring it${COLDEFAULT}"
    3393   retval=3   retval=3
    3394   fi   fi
    3395    
    Legend:
    Removed from v.1625  
    changed lines
      Added in v.1649