--- trunk/mage/usr/lib/mage/pkgbuild_dir.sh 2005/10/21 14:23:59 272 +++ trunk/mage/usr/lib/mage/pkgbuild_dir.sh 2007/01/22 00:24:14 419 @@ -4,7 +4,10 @@ # builds packages from given dir # -# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/pkgbuild_dir.sh,v 1.9 2005-10-21 14:23:59 niro Exp $ +# $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 $ + +# set default user mage.rc +: ${MAGERC="/etc/mage.rc"} PKGSUFFIX="mpk" PKGNAME="$1" @@ -21,15 +24,23 @@ [[ -z $1 ]] && echo "No package name given. Aborting." && exit 1 [[ -z $2 ]] && echo "No source dir given. Aborting." && exit 1 -if [ -f /etc/mage.rc ] +if [ -f ${MAGERC} ] then - source /etc/mage.rc + source ${MAGERC} else - echo "Your /etc/mage.rc is missing. Aborting." + echo "Your ${MAGERC} is missing. Aborting." exit 1 fi source ${MLIBDIR}/mage4.functions.sh +# set PKGDIR and BUILDDIR and BINDIR to MROOT +if [[ -n ${MROOT} ]] +then + export PKGDIR=${MROOT}/${PKGDIR} + export BUILDDIR=${MROOT}/${BUILDDIR} + export BINDIR=${MROOT}/${BINDIR} +fi + build_preinstall() { if [ -d ${BUILDDIR}/${PKGNAME} ] @@ -117,7 +128,11 @@ ;; "character special file") - echo "${I#${SEARCHDIRS}*}§${FILEPOSIX}" >> ${BUILDDIR}/${PKGNAME}/.char + # convert hex2dec + # printf '%d' 0x12 -> 18 + local CHAR_MAJOR="$(printf 0x$(stat -c %t $I))" + local CHAR_MINOR="$(printf 0x$(stat -c %T $I))" + echo "${I#${SEARCHDIRS}*}§${FILEPOSIX}§${CHAR_MAJOR}§${CHAR_MINOR}" >> ${BUILDDIR}/${PKGNAME}/.char ;; *)