/[magellan-source]/trunk/mage/usr/lib/mage/mage4.functions.sh

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

Parent Directory | Revision Log | View Patch Patch

-revision 1590 by niro,
Thu Dec 29 15:12:05 2011 UTC
+revision 1649 by niro,
Fri Jan 13 21:04:02 2012 UTC
 Line 66 
 mchecksum()
  	case ${method} in
  		md5) cmd="md5sum" ;;
  		sha256) cmd="sha256sum" ;;
- 		*) die "mchecksum(): unkown method '${method}'" ;;
+ 		*) die "mchecksum(): unknown method '${method}'" ;;
  	esac
  	if [[ -d ${rundir} ]]
 Line 1401 
 mdownload()
  	real_uris="$(convertmirrors ${uri})"
  	# verbose or not
- 	mqueryfeature "!verbose" && wget_opts="--quiet"
+ 	mqueryfeature "!verbose" && wget_opts+=" --quiet"
  	# filter wget options if busybox was found
- 	wget_opts="$(busybox_filter_wget_options ${WGET_FETCH_OPTIONS})"
+ 	wget_opts+=" $(busybox_filter_wget_options ${WGET_FETCH_OPTIONS})"
  	# create outputdir
  	[[ ! -d ${outputdir} ]] && install -d "${outputdir}"
 Line 1653 
 choppkgname()
  	then
  		#cuts ARCH and PBUILD
  		#ARCH comes from ${MAGERC}
- 		MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}-r*.::g")
+ 		MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}$(print_distrotag)-r*.::g")
  		#cuts version number
  		MAGENAME=$(basename ${MAGENAME%-*} .mage)
 Line 2999 
 pkgsearch()
  	local state
  	local descriptiom
  	local homepage
+ 	local license
  	local i
  	local all_installed
  	local ipver
-Line 3035 
 pkgsearch()
+Line 3036 
 pkgsearch()
  			state="$(get_value_from_magefile STATE ${magefile})"
  			description="$(get_value_from_magefile DESCRIPTION ${magefile})"
  			homepage="$(get_value_from_magefile HOMEPAGE ${magefile})"
+ 			license="$(get_value_from_magefile LICENSE ${magefile})"
  			# all installed
  			for i in $(get_uninstall_candidates --pname ${pname} --pcat ${pcat})
  			do
  				ipver="$(magename2pver ${i})"
  				ipbuild="$(magename2pbuild ${i})"
  				if [[ -z ${all_installed} ]]
  				then
  					all_installed="${ipver}-${ipbuild}"
-Line 3050 
 pkgsearch()
+Line 3052 
 pkgsearch()
  				fi
  			done
  			[[ -z ${all_installed} ]] && all_installed="none"
  			case ${state} in
  				stable) state=${COLGREEN}"[s] ";;
  				testing) state=${COLYELLOW}"[t] ";;
-Line 3095 
 EOF
+Line 3097 
 EOF
  		echo "      Installed versions: ${all_installed}"
  		echo "      Description: ${description}"
  		echo "      Homepage: ${homepage}"
+ 		if [[ ! -z ${license} ]]
+ 		then
+ 			echo "      License:  ${license}"
+ 		fi
  		echo "      Depends: ${deps}"
  		echo "      SDepends: ${sdeps}"
  		echo
-Line 3285 
 known_mage_feature()
+Line 3291 
 known_mage_feature()
  		ccache|!ccache) retval=0 ;;
  		check|!check) retval=0 ;;
  		compressdoc|!compressdoc) retval=0 ;;
+ 		debug|!debug) retval=0 ;;
  		distcc|!distcc) retval=0 ;;
  		kernelsrcunpack|!kernelsrcunpack) retval=0 ;;
  		libtool|!libtool) retval=0 ;;
  		linuxsymlink|!linuxsymlink) retval=0 ;;
  		pkgbuild|!pkgbuild) retval=0 ;;
+ 		pkgdistrotag|!pkgdistrotag) retval=0 ;;
  		purge|!purge) retval=0 ;;
  		qalint|!qalint) retval=0 ;;
  		regentree|!regentree) retval=0 ;;
- 		stepbystep|!stepbystep) retval=0 ;;
+ 		resume|!resume) retval=0 ;;
  		srcpkgbuild|!srcpkgbuild) retval=0 ;;
  		srcpkgtarball|!srcpkgtarball) retval=0 ;;
+ 		static|!static) retval=0 ;;
+ 		stepbystep|!stepbystep) retval=0 ;;
  		strip|!strip) retval=0 ;;
+ 		verbose|!verbose) retval=0 ;;
  		*) retval=1 ;;
  	esac
-Line 3305 
 known_mage_feature()
+Line 3316 
 known_mage_feature()
  load_mage_features()
  {
- 	echo -en "${COLBLUE}---${COLGREEN} Loading mage-features... ${COLDEFAULT}"
  	for i in ${MAGE_FEATURES_GLOBAL[*]} ${MAGE_FEATURES[*]}
  	do
  		FVERBOSE=off msetfeature ${i}
  	done
- 	echo -e "${COLGREEN}done${COLDEFAULT}"
  }
  msetfeature()
-Line 3328 
 msetfeature()
+Line 3336 
 msetfeature()
  		if ! known_mage_feature "${feature}"
  		then
- 			[[ ${FVERBOSE} = off ]] || echo "unkown feature ${feature}, ignoring it"
+ 			[[ ${FVERBOSE} = off ]] || echo -e "${COLRED}Unknown feature '${feature}', ignoring it${COLDEFAULT}"
  			return 3
  		fi
-Line 3336 
 msetfeature()
+Line 3344 
 msetfeature()
  		do
  			if [[ ${MAGE_FEATURES_CURRENT[${i}]} = ${feature} ]]
  			then
- 				[[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' already enabled"
+ 				[[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' already enabled${COLDEFAULT}"
  				MAGE_FEATURES_CURRENT[${i}]="${feature}"
  				found=1
  			elif [[ ${MAGE_FEATURES_CURRENT[${i}]} = !${feature} ]]
  			then
- 				[[ ${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}"
  				MAGE_FEATURES_CURRENT[${i}]="${feature}"
  				found=1
  			elif [[ ${MAGE_FEATURES_CURRENT[${i}]} = ${feature//!} ]]
  			then
- 				[[ ${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}"
  				MAGE_FEATURES_CURRENT[${i}]="${feature}"
  				found=1
  			fi
-Line 3356 
 msetfeature()
+Line 3364 
 msetfeature()
  		# it was not declared. in this case enable it
  		if [[ ${found} = 0 ]]
  		then
- 			[[ ${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}"
  			MAGE_FEATURES_CURRENT=( ${MAGE_FEATURES_CURRENT[*]} "${feature}" )
  		fi
-Line 3381 
 mqueryfeature()
+Line 3389 
 mqueryfeature()
  			fi
  		done
  	else
+ 		[[ ${FVERBOSE} = off ]] || echo -e "${COLRED}Unknown feature '${feature}', ignoring it${COLDEFAULT}"
  		retval=3
  	fi

 Legend:



Removed from v.1590
 


changed lines


 
Added in v.1649
 Legend:



Removed from v.1590
 


changed lines


 
Added in v.1649
-Removed from v.1590
+Added in v.1649