From acf2022938390645e4766b2f17345573490f9e10 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 28 Aug 2020 20:13:10 +0200
Subject: [PATCH] update release task

---
 Makefile | 33 ++++++++-------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index f0defb9..2fc959d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,36 +5,19 @@ npm-watch:
 	npm run watch
 
 .ONESHELL:
-archive_zip: npm-build
-	test -d releases || mkdir releases
-	test -d releases/side_menu && rm -fr releases/side_menu
-	test -f releases/side_menu.zip && rm -f releases/side_menu.zip
-	mkdir releases/side_menu
-	cp -r README.md appinfo css lib img l10n js src templates releases/side_menu
-	cd releases
-	zip -r side_menu.zip side_menu
-
-.ONESHELL:
-archive_targz: npm-build
-	test -d releases || mkdir releases
-	test -d releases/side_menu && rm -fr releases/side_menu
-	test -f releases/side_menu.tar.gz && rm -f releases/side_menu.tar.gz
-	mkdir releases/side_menu
-	cp -r README.md appinfo css lib img l10n js src templates releases/side_menu
-	cd releases
-	tar cvzf side_menu.tar.gz side_menu
-
-.ONESHELL:
-release: archive_zip archive_targz
+release: npm-build
 	if [ -z "$$VERSION" ]; then
 		echo "VERSION required"
 		exit 1
 	fi
 
-	cd releases
-
-	mv side_menu.tar.gz side_menu_v$$VERSION.tar.gz
-	mv side_menu.zip side_menu_v$$VERSION.zip
+	test -d releases/$$VERSION && rm -fr releases/$$VERSION
+	mkdir -p releases/$$VERSION/side_menu
+	cp -r README.md appinfo css lib img l10n js src templates releases/$$VERSION/side_menu
+	cd releases/$$VERSION
+	zip -r side_menu_v$$VERSION.zip side_menu
+	tar cvzf side_menu_v$$VERSION.tar.gz side_menu
+	rm -fr side_menu
 	openssl dgst -sha512 -sign $$HOME/.nextcloud/certificates/side_menu.key side_menu_v$$VERSION.tar.gz | openssl base64 > side_menu_v$$VERSION.sig
 
 translations: