[packages/chromium-browser/DEVEL] clean empty dirs only in tarball creation

glen glen at pld-linux.org
Sun Jan 13 17:42:12 CET 2013


commit 23e8b4854b8227ee5b96a7885b0d513de07fd270
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Jan 13 17:12:01 2013 +0200

    clean empty dirs only in tarball creation

 clean-source.sh | 6 ++++--
 get-source.sh   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/clean-source.sh b/clean-source.sh
index 64ba65f..6861e5b 100755
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -778,8 +778,10 @@ if [ "${nacl:-1}" != "0" ]; then
 	rm -rf native_client/toolchain/linux_x86_newlib
 fi
 
-# cleanup empty dirs
-find -type d '!' -name '.' -print0 | sort -zr | xargs -0 rmdir --ignore-fail-on-non-empty > REMOVED-dirs.txt
+if [ "${emptydirs:-0}" != "0" ]; then
+	# cleanup empty dirs
+	find -type d '!' -name '.' -print0 | sort -zr | xargs -0 rmdir --ignore-fail-on-non-empty > REMOVED-dirs.txt
+fi
 
 # report what's in them
 for a in REMOVED-*.txt; do
diff --git a/get-source.sh b/get-source.sh
index a4b549e..15f8cfd 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -76,7 +76,7 @@ else
 fi
 
 if [ "$CHANNEL" != "dev" ]; then
-	sh -x $WORK_DIR/clean-source.sh v8=$v8 protobuf=0
+	sh -x $WORK_DIR/clean-source.sh v8=$v8 emptydirs=1
 fi
 
 # do not keep REMOVED*.txt in tarball. they are visible in .log anyway
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/ce99e0e33428a829fbd63d87ef159cf79cc29656



More information about the pld-cvs-commit mailing list