--- trunk/mage/usr/lib/mage/pkgbuild_dir.sh 2007/01/22 00:24:14 419 +++ trunk/mage/usr/lib/mage/pkgbuild_dir.sh 2007/03/19 19:10:07 440 @@ -4,7 +4,7 @@ # builds packages from given dir # -# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/pkgbuild_dir.sh,v 1.13 2007-01-22 00:24:14 niro Exp $ +# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/pkgbuild_dir.sh,v 1.14 2007-03-19 19:10:07 niro Exp $ # set default user mage.rc : ${MAGERC="/etc/mage.rc"} @@ -24,6 +24,7 @@ [[ -z $1 ]] && echo "No package name given. Aborting." && exit 1 [[ -z $2 ]] && echo "No source dir given. Aborting." && exit 1 +source /etc/mage.rc.global if [ -f ${MAGERC} ] then source ${MAGERC} @@ -58,8 +59,7 @@ build_postinstall() { - echo - echo "Fetching files for package '${PKGNAME}' ..." + echo -e "${COLBLUE}===${COLGREEN} fetching files for package '${PKGNAME}' ...${COLDEFAULT}" # md5sums will only be generated for files: $M_MD5SUM @@ -148,10 +148,8 @@ unset IFS # forcing mtime to same value - echo -n "Forcing mtime to the same value ..." - find ${BUILDDIR}/${PKGNAME}/binfiles \ - -exec touch -m -r ${BUILDDIR}/${PKGNAME}/.mtime '{}' ';' \ - && echo done || echo false + echo -e "${COLBLUE}===${COLGREEN} forcing mtime to the same value ...${COLDEFAULT}" + find ${BUILDDIR}/${PKGNAME}/binfiles -exec touch -m -r ${BUILDDIR}/${PKGNAME}/.mtime '{}' ';' } build_rmtimestamp() @@ -161,7 +159,7 @@ build_package() { - echo "Building Package ..." + echo -e "${COLBLUE}===${COLGREEN} building package tarball ...${COLDEFAULT}" cd ${BUILDDIR} tar cvjf ${PKGNAME}.tar.bz2 ./${PKGNAME} install -d ${PKGDIR}