From 5ee38905e5edf8836566db859428b57c1d8f58e1 Mon Sep 17 00:00:00 2001 From: David James Date: Thu, 28 Jul 2011 16:55:16 -0700 Subject: [PATCH] Don't rm $OUTDIR during archive_build.sh. BUG=chromium-os:18382 TEST=Run sample buildbot run. Change-Id: Ib6e81e9ec4b90b8f089da6de50bee1accafec9dd Reviewed-on: http://gerrit.chromium.org/gerrit/4978 Reviewed-by: Chris Sosa Tested-by: David James --- archive_build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/archive_build.sh b/archive_build.sh index 5b3fb869cc..41c079c8a1 100755 --- a/archive_build.sh +++ b/archive_build.sh @@ -151,7 +151,6 @@ FACTORY_ZIPFILE="${OUTDIR}/factory_${FLAGS_zipname}" echo "archive to dir: $OUTDIR" echo "archive to file: $ZIPFILE" -rm -rf "$OUTDIR" mkdir -p "$OUTDIR" # Modify image for test if flag set. @@ -238,6 +237,7 @@ fi echo "Compressing and archiving build..." cd "$FLAGS_from" MANIFEST=`ls | grep -v factory | grep -v netboot` +rm -f "${ZIPFILE}" zip -r "${ZIPFILE}" ${MANIFEST} if [ $FLAGS_factory_test_mod -eq $FLAGS_TRUE ] || \ @@ -258,6 +258,7 @@ if [ $FLAGS_factory_test_mod -eq $FLAGS_TRUE ] || \ [ -n "${IMG_DIR}" ] && rm -f latest && ln -s "${IMG_DIR}" latest FACTORY_MANIFEST=`find factory_shim factory_test -follow \ -type f | grep -E "(factory_image|factory_install|partition|netboot)"` + rm -f "${FACTORY_ZIPFILE}" zip "${FACTORY_ZIPFILE}" ${FACTORY_MANIFEST} echo "Zipped" popd