[Collab-qa-commits] r1443 - ddpo-by-mail

[Raphael Geissert]

Author: atomo64-guest
Date: 2009-04-26 06:25:36 +0000 (Sun, 26 Apr 2009)
New Revision: 1443

Modified:
   ddpo-by-mail/Makefile
Log:
Fix some bugs that prevented a semi-clean data/ dir from being cleaned up


Modified: ddpo-by-mail/Makefile
===================================================================
--- ddpo-by-mail/Makefile	2009-04-26 05:38:24 UTC (rev 1442)
+++ ddpo-by-mail/Makefile	2009-04-26 06:25:36 UTC (rev 1443)
@@ -55,14 +55,16 @@
 
 clean-update::
 	$(RM) -f $(DATA_DIR)/debian-installer/binary-*/Packages.gz
-	rmdir -p --ignore-fail-on-non-empty $(DATA_DIR)/debian-installer/binary-*
 
 clean: clean-update
-	# remove broken symlinks:
-	find -L $(DATA_DIR) -type l -exec unlink '{}' ';'
-	rmdir $(DATA_DIR) || ls $(DATA_DIR)
+	[ ! -d $(DATA_DIR) ] || { \
+	# remove broken symlinks: \
+	find -L $(DATA_DIR) -type l -exec unlink '{}' ';' ; \
+	find $(DATA_DIR) -type d | sort -r | xargs -P0 -n1 rmdir -p --ignore-fail-on-non-empty ; \
+	[ ! -d $(DATA_DIR) ] || ls -R $(DATA_DIR) ; \
+	}
 
 clean-update::
-	cd $(DATA_DIR) && $(RM) -f $(UPDATE_TARGETS)
+	[ ! -d $(DATA_DIR) ] || cd $(DATA_DIR) && $(RM) -f $(UPDATE_TARGETS)
 
 .PHONY: clean clean-update update $(UPDATE_TARGETS) phony