# HG changeset patch # User Antoine Bodin # Date 1295911466 -3600 # Node ID 05010d8d951b1a99773109cc8f99cb6ed2b2e5c4 # Parent 0f3501c4d867b3526d37cdf9f0815fe369528d1c Replace subprocesses by command group to speedup things a little diff -r 0f3501c4d867 -r 05010d8d951b tazpkg --- a/tazpkg Tue Jan 25 00:14:07 2011 +0100 +++ b/tazpkg Tue Jan 25 00:24:26 2011 +0100 @@ -420,10 +420,10 @@ # Get absolute path ROOT=$(cd $ROOT; pwd) fi - ( + { # Create package path early to avoid dependencies loop mkdir -p $TMP_DIR - ( cd $TMP_DIR ; cpio --quiet -i receipt > /dev/null 2>&1) < $PACKAGE_FILE + { cd $TMP_DIR ; cpio --quiet -i receipt > /dev/null 2>&1; } < $PACKAGE_FILE . $TMP_DIR/receipt if grep -q ^pre_depends $TMP_DIR/receipt; then pre_depends $ROOT @@ -442,7 +442,7 @@ $ROOT$LOCALSTATE/installed.md5 2> /dev/null cd $(dirname $PACKAGE_FILE) md5sum $(basename $PACKAGE_FILE) >> $ROOT$LOCALSTATE/installed.md5 - ) + } # Resolve package deps. check_for_deps $ROOT if [ ! "$MISSING_PACKAGE" = "" ]; then @@ -544,12 +544,12 @@ # save 'official' configuration files eval_gettext "Saving configuration files for \$PACKAGE... " for i in $CONFIG_FILES; do - ( cd fs ; find ${i#/} -type f ) - done | ( cd fs ; cpio -o -H newc --quiet | gzip -9 ) > \ + { cd fs ; find ${i#/} -type f; } + done | { cd fs ; cpio -o -H newc --quiet | gzip -9; } > \ $ROOT$INSTALLED/$PACKAGE/volatile.cpio.gz # keep user configuration files for i in $CONFIG_FILES; do - ( cd fs ; find ${i#/} -type f ) + { cd fs ; find ${i#/} -type f; } done | while read i; do [ -e $ROOT/$i ] || continue cp -a $ROOT/$i fs/$i @@ -625,7 +625,7 @@ local saved; saved=$PACKAGE mkdir -p $TMP_DIR - ( cd $TMP_DIR ; cpio --quiet -i receipt > /dev/null 2>&1) < $PACKAGE_FILE + { cd $TMP_DIR ; cpio --quiet -i receipt > /dev/null 2>&1; } < $PACKAGE_FILE . $TMP_DIR/receipt PACKAGE=$saved rm -rf $TMP_DIR @@ -688,7 +688,7 @@ mkdir $TMP_DIR for i in $pkg-*.tazpkg; do [ -f $i ] || continue - ( cd $TMP_DIR ; cpio --quiet -i receipt > /dev/null 2>&1) < $i + { cd $TMP_DIR ; cpio --quiet -i receipt > /dev/null 2>&1; } < $i [ "$(. $TMP_DIR/receipt; echo $PACKAGE)" = "$pkg" ] || continue if grep -q ^$(package_fullname_in_dir $TMP_DIR).tazpkg$ $list then @@ -2050,7 +2050,7 @@ done > files.list mkdir fs cd fs - ( cd / ; cpio -o -H newc --quiet ) < ../files.list | cpio -idm --quiet > /dev/null + { cd / ; cpio -o -H newc --quiet; } < ../files.list | cpio -idm --quiet > /dev/null mkdir -p etc/tazlito for i in $INSTALLED/*/receipt; do EXTRAVERSION="" @@ -2115,11 +2115,11 @@ ln -s / rootfs mkdir tmp sed 's/^/rootfs/' < files.list | cpio -o -H newc --quiet |\ - ( cd tmp ; cpio -idm --quiet >/dev/null ) + { cd tmp ; cpio -idm --quiet >/dev/null; } mv tmp/rootfs fs if [ -f $INSTALLED/$PACKAGE/volatile.cpio.gz ]; then zcat $INSTALLED/$PACKAGE/volatile.cpio.gz | \ - ( cd fs; cpio -idm --quiet ) + { cd fs; cpio -idm --quiet; } fi if grep -q repack_cleanup $INSTALLED/$PACKAGE/receipt; then . $INSTALLED/$PACKAGE/receipt