--- trunk/mage/usr/lib/mage/pkgbuild_dir.sh 2007/03/19 19:10:07 440 +++ tags/mage-0_4_23/usr/lib/mage/pkgbuild_dir.sh 2011/01/28 21:30:39 1210 @@ -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.14 2007-03-19 19:10:07 niro Exp $ +# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/pkgbuild_dir.sh,v 1.15 2007-03-19 19:24:46 niro Exp $ # set default user mage.rc : ${MAGERC="/etc/mage.rc"} @@ -14,10 +14,30 @@ SEARCHDIRS="$2" MLIBDIR=/usr/lib/mage +## only for tests -> normally in /etc/rc.d/init.d/functions COLRED="\033[1;6m\033[31m" COLGREEN="\033[1;6m\033[32m" +COLYELLOW="\033[1;6m\033[33m" +COLBLUE="\033[1;6m\033[34m" +COLMAGENTA="\033[1;6m\033[35m" +COLWHITE="\033[1;6m\033[37m" +COLGRAY="\033[0;6m\033[37m" +COLBOLD="\033[1m" COLDEFAULT="\033[0m" +if [[ ${NOCOLORS} = true ]] +then + COLRED="" + COLGREEN="" + COLYELLOW="" + COLBLUE="" + COLMAGENTA="" + COLWHITE="" + COLGRAY="" + COLBOLD="" + COLDEFAULT="" +fi + # export default C locale export LC_ALL=C @@ -25,13 +45,7 @@ [[ -z $2 ]] && echo "No source dir given. Aborting." && exit 1 source /etc/mage.rc.global -if [ -f ${MAGERC} ] -then - source ${MAGERC} -else - echo "Your ${MAGERC} is missing. Aborting." - exit 1 -fi +[[ -f ${MAGERC} ]] && source ${MAGERC} source ${MLIBDIR}/mage4.functions.sh # set PKGDIR and BUILDDIR and BINDIR to MROOT @@ -124,7 +138,7 @@ ;; "block special file") - echo "${I#${SEARCHDIRS}*}§${FILEPOSIX}" >> ${BUILDDIR}/${PKGNAME}/.pipes + echo "${I#${SEARCHDIRS}*}§${FILEPOSIX}§${FILEOWNER}§${FILEGROUP}" >> ${BUILDDIR}/${PKGNAME}/.pipes ;; "character special file") @@ -132,7 +146,11 @@ # 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 + echo "${I#${SEARCHDIRS}*}§${FILEPOSIX}§${CHAR_MAJOR}§${CHAR_MINOR}§${FILEOWNER}§${FILEGROUP}" >> ${BUILDDIR}/${PKGNAME}/.char + ;; + + "fifo") + echo "${I#${SEARCHDIRS}*}§${FILEPOSIX}§${FILEOWNER}§${FILEGROUP}" >> ${BUILDDIR}/${PKGNAME}/.fifo ;; *)