From e333e42f6fe024933e299d6833718ec6c419c922 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 8 Mar 2019 16:13:45 +0100
Subject: Fix CI and complete Makefile

---
 Makefile.example | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'Makefile.example')

diff --git a/Makefile.example b/Makefile.example
index 14e6032a4..16c060593 100644
--- a/Makefile.example
+++ b/Makefile.example
@@ -40,6 +40,7 @@ clean:
 	-rm -rf *~*
 	-find . -name '*.pyc' -exec rm {} \;
 	-find . -name '.*.swp' -exec rm {} \;
+	-find . -name "__pycache__" -exec rm -rf {} \;
 	-rm -rf dist ishtar.egg-info
 
 update: clean syncdb compilemessages collectstatic
@@ -252,9 +253,19 @@ deb: clean
 	debuild -i -us -uc -b
 
 push_install: clean
-	tar cvjf install-ishtar-$(version).tar.bz2 install/
-	scp install-ishtar-$(version).tar.bz2 root@git:/var/www/ishtar/install/
-	rm install-ishtar-$(version).tar.bz2
+	INSTALL_PATH=/var/www/ishtar/install/ ; \
+	ARCHIVE_NAME=install-ishtar-$(version).tar.bz2 ; \
+	tar cvjf $$ARCHIVE_NAME install/ ; \
+	scp $$ARCHIVE_NAME root@git.iggdrasil.net:$$INSTALL_PATH ; \
+	rm $$ARCHIVE_NAME ; 
+	#ifeq ($(BRANCH_NAME),master) \
+	#     ssh root@git rm $$INSTALL_PATH"install-ishtar-latest.tar.bz2" ; \
+	#     ssh root@git ln -s $$INSTALL_PATH$$ARCHIVE_NAME $$INSTALL_PATH"install-ishtar-latest.tar.bz2" ;\
+        #endif \
+	#ifeq ($(BRANCH_NAME),develop) \
+	#     ssh root@git rm $$INSTALL_PATH"install-ishtar-develop.tar.bz2" ; \
+	#     ssh root@git ln -s $$INSTALL_PATH$$ARCHIVE_NAME $$INSTALL_PATH"install-ishtar-develop.tar.bz2" ;\
+        #endif
 
 sass:
 	./node_modules/node-sass/bin/node-sass scss/custom.scss --output-style compressed > ishtar_common/static/bootstrap/bootstrap.css
-- 
cgit v1.2.3