Magellan Linux

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

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

revision 1603 by niro, Tue Jan 3 16:17:48 2012 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 3325  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    

Legend:
Removed from v.1603  
changed lines
  Added in v.1626