From 386b144750d99f0c67c9d370c07b1d489e9b894e Mon Sep 17 00:00:00 2001
From: n-peugnet <n.peugnet@free.fr>
Date: Thu, 7 Nov 2019 17:14:17 +0100
Subject: fix(dist): correct dir permissions + VERSION always included

---
 Makefile | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 7ca1932..f257a04 100644
--- a/Makefile
+++ b/Makefile
@@ -34,23 +34,27 @@ dist/%: ENV := prod
 dist/w_cms_%.zip: all
 	@echo "Building Zip release..."
 	mkdir -p $(dir $@)
-	git archive --format=zip HEAD -o $@
+# Include git tracked files (everything except ignored) + needed files
+	zip -r $@ \
+		$(shell git ls-tree -r HEAD --name-only) \
+		VERSION \
+		assets/js \
+		vendor \
+		-x "*test*" \
+		-x "*docs*"
+# Include non-empty git tracked directories (to keep dir permissions)
+	zip $@ $(shell git ls-tree -r HEAD --name-only -d)
+# Remove non-useful files
 	zip -d $@ \
-		"src*" \
+		$(js_sources) \
+		$(js_srcmaps) \
 		.default.env \
 		.gitignore \
 		.release-it.json \
-		composer.json \
-		composer.lock \
 		Makefile \
+		"composer*" \
 		"package*" \
 		webpack.config.js
-	zip -r $@ \
-		VERSION \
-		assets/js \
-		vendor \
-		-x "*test*" \
-		-x "*docs*"
 
 assets/js/%.bundle.js assets/js/%.bundle.map: src/%.js node_modules
 	@echo "Building JS Bundles..."
@@ -77,17 +81,17 @@ node_modules: package.json package-lock.json
 	npm install --loglevel=error
 
 clean: buildclean
-	@echo "Cleaning PHP..."
+	@echo "Cleaning make artifacts..."
 	rm -rf vendor
-	@echo "Cleaning JS..."
 	rm -rf node_modules
+	rm -rf VERSION
 
 distclean: buildclean
+	@echo "Cleaning dist artifacts..."
 	rm -rf dist
 
 buildclean:
 	@echo "Cleaning build artifacts..."
-	rm -rf VERSION
 	rm -rf $(js_bundles)
 	rm -rf $(js_srcmaps)
 
-- 
cgit v1.2.3