--- trunk/mage/usr/lib/mage/mage4.functions.sh 2012/02/18 13:48:34 1758 +++ trunk/mage/usr/lib/mage/mage4.functions.sh 2012/10/25 07:07:28 1961 @@ -1898,7 +1898,7 @@ fi done - count="${count}+1" + count="$(( ${count}+1 ))" # fill output up with zeros for (( i=${#count}; i < 4; i++ )); do output="${output}0"; done @@ -3119,7 +3119,12 @@ "") continue;; esac - deps="${deps} $(basename ${dep%-*})" + if [[ -z ${deps} ]] + then + deps="$(basename ${dep%-*})" + else + deps="${deps} $(basename ${dep%-*})" + fi done << EOF ${depsfull} EOF @@ -3130,7 +3135,12 @@ "") continue;; esac - sdeps="${sdeps} $(basename ${dep%-*})" + if [[ -z ${sdeps} ]] + then + sdeps="$(basename ${dep%-*})" + else + sdeps="${sdeps} $(basename ${dep%-*})" + fi done << EOF ${sdepsfull} EOF @@ -3144,7 +3154,7 @@ then echo " License: ${license}" fi - echo " Depends: ${deps}" + echo " Depends: ${deps}" echo " SDepends: ${sdeps}" echo @@ -3261,16 +3271,20 @@ need_busybox_support() { local cmd + local busybox cmd="$1" - if [[ -x /bin/busybox ]] - then - if [[ $(readlink $(which ${cmd})) = /bin/busybox ]] + for busybox in {,/usr}/bin/busybox + do + if [[ -x ${busybox} ]] then - # needs busybox support - return 0 + if [[ $(readlink $(which ${cmd})) = ${busybox} ]] + then + # needs busybox support + return 0 + fi fi - fi + done # no busybox return 1 @@ -3441,7 +3455,7 @@ mprintfeatures() { - echo "Global features: ${MAGE_FEATURES_GLOBAL[*]}" - echo "Local features: ${MAGE_FEATURES[*]}" - echo "Current features: ${MAGE_FEATURES_CURRENT[*]}" + echo -e "${COLRED}Global features:${COLDEFAULT} ${MAGE_FEATURES_GLOBAL[*]}" + echo -e "${COLYELLOW}Local features:${COLDEFAULT} ${MAGE_FEATURES[*]}" + echo -e "${COLGREEN}Current features:${COLDEFAULT} ${MAGE_FEATURES_CURRENT[*]}" }