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 1590 by niro, Thu Dec 29 15:12:05 2011 UTC revision 1626 by niro, Fri Jan 13 13:07:38 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 3293  known_mage_feature() Line 3293  known_mage_feature()
    3293   purge|!purge) retval=0 ;;   purge|!purge) retval=0 ;;
    3294   qalint|!qalint) retval=0 ;;   qalint|!qalint) retval=0 ;;
    3295   regentree|!regentree) retval=0 ;;   regentree|!regentree) retval=0 ;;
    3296     resume|!resume) retval=0 ;;
    3297   stepbystep|!stepbystep) retval=0 ;;   stepbystep|!stepbystep) retval=0 ;;
    3298   srcpkgbuild|!srcpkgbuild) retval=0 ;;   srcpkgbuild|!srcpkgbuild) retval=0 ;;
    3299   srcpkgtarball|!srcpkgtarball) retval=0 ;;   srcpkgtarball|!srcpkgtarball) retval=0 ;;
    # Line 3305  known_mage_feature() Line 3306  known_mage_feature()
    3306    
    3307  load_mage_features()  load_mage_features()
    3308  {  {
      echo -en "${COLBLUE}---${COLGREEN} Loading mage-features... ${COLDEFAULT}"  
    3309   for i in ${MAGE_FEATURES_GLOBAL[*]} ${MAGE_FEATURES[*]}   for i in ${MAGE_FEATURES_GLOBAL[*]} ${MAGE_FEATURES[*]}
    3310   do   do
    3311   FVERBOSE=off msetfeature ${i}   FVERBOSE=off msetfeature ${i}
    3312   done   done
       
      echo -e "${COLGREEN}done${COLDEFAULT}"  
    3313  }  }
    3314    
    3315  msetfeature()  msetfeature()
    # Line 3328  msetfeature() Line 3326  msetfeature()
    3326    
    3327   if ! known_mage_feature "${feature}"   if ! known_mage_feature "${feature}"
    3328   then   then
    3329   [[ ${FVERBOSE} = off ]] || echo "unkown feature ${feature}, ignoring it"   [[ ${FVERBOSE} = off ]] || echo "unknown feature ${feature}, ignoring it"
    3330   return 3   return 3
    3331   fi   fi
    3332    
    # Line 3336  msetfeature() Line 3334  msetfeature()
    3334   do   do
    3335   if [[ ${MAGE_FEATURES_CURRENT[${i}]} = ${feature} ]]   if [[ ${MAGE_FEATURES_CURRENT[${i}]} = ${feature} ]]
    3336   then   then
    3337   [[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' already enabled"   [[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' already enabled${COLDEFAULT}"
    3338   MAGE_FEATURES_CURRENT[${i}]="${feature}"   MAGE_FEATURES_CURRENT[${i}]="${feature}"
    3339   found=1   found=1
    3340   elif [[ ${MAGE_FEATURES_CURRENT[${i}]} = !${feature} ]]   elif [[ ${MAGE_FEATURES_CURRENT[${i}]} = !${feature} ]]
    3341   then   then
    3342   [[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' currently disabled, enabling it!"   [[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' currently disabled, enabling it!${COLDEFAULT}"
    3343   MAGE_FEATURES_CURRENT[${i}]="${feature}"   MAGE_FEATURES_CURRENT[${i}]="${feature}"
    3344   found=1   found=1
    3345   elif [[ ${MAGE_FEATURES_CURRENT[${i}]} = ${feature//!} ]]   elif [[ ${MAGE_FEATURES_CURRENT[${i}]} = ${feature//!} ]]
    3346   then   then
    3347   [[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature//!}' currently enabled, disabling it!"   [[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature//!}' currently enabled, disabling it!${COLDEFAULT}"
    3348   MAGE_FEATURES_CURRENT[${i}]="${feature}"   MAGE_FEATURES_CURRENT[${i}]="${feature}"
    3349   found=1   found=1
    3350   fi   fi
    # Line 3356  msetfeature() Line 3354  msetfeature()
    3354   # it was not declared. in this case enable it   # it was not declared. in this case enable it
    3355   if [[ ${found} = 0 ]]   if [[ ${found} = 0 ]]
    3356   then   then
    3357   [[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' was not declared, enabling it!"   [[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' was not declared, enabling it!${COLDEFAULT}"
    3358   MAGE_FEATURES_CURRENT=( ${MAGE_FEATURES_CURRENT[*]} "${feature}" )   MAGE_FEATURES_CURRENT=( ${MAGE_FEATURES_CURRENT[*]} "${feature}" )
    3359   fi   fi
    3360    
    Legend:
    Removed from v.1590  
    changed lines
      Added in v.1626