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 1599 by niro, Fri Dec 30 10:07:18 2011 UTC revision 1628 by niro, Fri Jan 13 13:13:14 2012 UTC
    # Line 66  mchecksum() Line 66  mchecksum()
    66   case ${method} in   case ${method} in
    67   md5) cmd="md5sum" ;;   md5) cmd="md5sum" ;;
    68   sha256) cmd="sha256sum" ;;   sha256) cmd="sha256sum" ;;
    69   *) die "mchecksum(): unkown method '${method}'" ;;   *) die "mchecksum(): unknown method '${method}'" ;;
    70   esac   esac
    71    
    72   if [[ -d ${rundir} ]]   if [[ -d ${rundir} ]]
    # 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 3285  known_mage_feature() Line 3285  known_mage_feature()
    3285   ccache|!ccache) retval=0 ;;   ccache|!ccache) retval=0 ;;
    3286   check|!check) retval=0 ;;   check|!check) retval=0 ;;
    3287   compressdoc|!compressdoc) retval=0 ;;   compressdoc|!compressdoc) retval=0 ;;
    3288     debug|!debug) retval=0 ;;
    3289   distcc|!distcc) retval=0 ;;   distcc|!distcc) retval=0 ;;
    3290   kernelsrcunpack|!kernelsrcunpack) retval=0 ;;   kernelsrcunpack|!kernelsrcunpack) retval=0 ;;
    3291   libtool|!libtool) retval=0 ;;   libtool|!libtool) retval=0 ;;
    # Line 3293  known_mage_feature() Line 3294  known_mage_feature()
    3294   purge|!purge) retval=0 ;;   purge|!purge) retval=0 ;;
    3295   qalint|!qalint) retval=0 ;;   qalint|!qalint) retval=0 ;;
    3296   regentree|!regentree) retval=0 ;;   regentree|!regentree) retval=0 ;;
    3297   stepbystep|!stepbystep) retval=0 ;;   resume|!resume) retval=0 ;;
    3298   srcpkgbuild|!srcpkgbuild) retval=0 ;;   srcpkgbuild|!srcpkgbuild) retval=0 ;;
    3299   srcpkgtarball|!srcpkgtarball) retval=0 ;;   srcpkgtarball|!srcpkgtarball) retval=0 ;;
    3300     static|!static) retval=0 ;;
    3301     stepbystep|!stepbystep) retval=0 ;;
    3302   strip|!strip) retval=0 ;;   strip|!strip) retval=0 ;;
    3303     verbose|!verbose) retval=0 ;;
    3304   *) retval=1 ;;   *) retval=1 ;;
    3305   esac   esac
    3306    
    # Line 3305  known_mage_feature() Line 3309  known_mage_feature()
    3309    
    3310  load_mage_features()  load_mage_features()
    3311  {  {
      echo -en "${COLBLUE}---${COLGREEN} Loading mage-features... ${COLDEFAULT}"  
    3312   for i in ${MAGE_FEATURES_GLOBAL[*]} ${MAGE_FEATURES[*]}   for i in ${MAGE_FEATURES_GLOBAL[*]} ${MAGE_FEATURES[*]}
    3313   do   do
    3314   FVERBOSE=off msetfeature ${i}   FVERBOSE=off msetfeature ${i}
    3315   done   done
       
      echo -e "${COLGREEN}done${COLDEFAULT}"  
    3316  }  }
    3317    
    3318  msetfeature()  msetfeature()
    # Line 3328  msetfeature() Line 3329  msetfeature()
    3329    
    3330   if ! known_mage_feature "${feature}"   if ! known_mage_feature "${feature}"
    3331   then   then
    3332   [[ ${FVERBOSE} = off ]] || echo "unkown feature ${feature}, ignoring it"   [[ ${FVERBOSE} = off ]] || echo -e "${COLRED}Unknown feature '${feature}', ignoring it${COLDEFAULT}"
    3333   return 3   return 3
    3334   fi   fi
    3335    
    # Line 3381  mqueryfeature() Line 3382  mqueryfeature()
    3382   fi   fi
    3383   done   done
    3384   else   else
    3385     [[ ${FVERBOSE} = off ]] || echo -e "${COLRED}Unknown feature '${feature}', ignoring it${COLDEFAULT}"
    3386   retval=3   retval=3
    3387   fi   fi
    3388    
    Legend:
    Removed from v.1599  
    changed lines
      Added in v.1628