From ab285f7a9c4d002af1fecb6e3f05b372bd38697c Mon Sep 17 00:00:00 2001
From: André Araújo <andre.araujo@lavid.ufpb.br>
Date: Wed, 14 Dec 2016 18:17:11 -0300
Subject: [PATCH] Atualiza Makefile

---
 Makefile | 57 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index 747c6a8..bcba235 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,28 @@
-PROJECT_NAME             = corretor
-VLIBRAS_NAME             = vlibras-wiki
-PYBOSSA_CONF             = /etc/apache2/sites-available/pybossa.conf
-PROJECT_DIR              = $(CURDIR)
-SED_REPLACE_ALL          = sed -i "s/$(1)/$(2)/g" "$(3)"
-SED_REPLACE_ALL_PATH     = sed -i "s\#$(1)\#$(2)\#g" "$(3)"
+PROJECT_NAME              = corretor
+VLIBRAS_WIKILIBRAS_ENV   := /etc/profile.d/lavid/vlibras/wikilibras_env.sh
+PROJECT_DIR              := $(CURDIR)
+SED_REPLACE_ALL           = sed -i "s/$(1)/$(2)/g" "$(3)"
+SED_REPLACE_ALL_PATH      = sed -i "s\#$(1)\#$(2)\#g" "$(3)"
+
+-include ${VLIBRAS_WIKILIBRAS_ENV}
 
 ifndef LOCALHOST
     ifndef NETWORK_INTERFACE
-        NETWORK_INTERFACE := $(shell ip route | awk '{print $$5; exit}')
+        NETWORK_INTERFACE := $(shell ip route | grep "default" | awk '{print $$5; exit}')
     endif
     ifdef NETWORK_INTERFACE
-        LOCALHOST := $(shell ip addr list ${NETWORK_INTERFACE} | grep "inet " | cut -d ' ' -f6 | cut -d/ -f1)
+        LOCALHOST ?= $(shell ip route get 1 | awk '{print $$7; exit}')
     endif
 endif
 
 ifndef LOCALHOST
-    LOCALHOST := localhost
+    LOCALHOST ?= 127.0.0.1
 endif
 
-install: uninstall config
-	@( \
+install: uninstall config env
+
+env:
+	@ ( \
 	    virtualenv ./env/; \
 	    . ./env/bin/activate; \
 	    pip install -U pip; \
@@ -27,14 +30,14 @@ install: uninstall config
 	    pip install -U ndg-httpsclient; \
 	    pip install -r requirements.txt; \
 	)
+
+create_project update_project:
+	@ echo "http://${LOCALHOST}/${PROJECT_NAME}-backend/$@"
 ifdef PYBOSSA_API_KEY
-	@ curl "http://${LOCALHOST}/${PROJECT_NAME}-backend/create_project" && echo ""
-	@ echo "http://${LOCALHOST}/${PROJECT_NAME}-backend/create_project"
+	@ curl "http://${LOCALHOST}/${PROJECT_NAME}-backend/$@" && echo ""
 endif
 
 config:
-	@ $(info Using interface: ${NETWORK_INTERFACE})
-	@ $(info Using local IP: ${LOCALHOST})
 	@ cp settings_local.py.tmpl settings_local.py
 	@ $(call SED_REPLACE_ALL_PATH,<path-to-project>,${PROJECT_DIR},settings_local.py)
 	@ $(call SED_REPLACE_ALL,localhost,${LOCALHOST},settings_local.py)
@@ -48,32 +51,36 @@ endif
 	@ $(call SED_REPLACE_ALL,user1,$$USER,./contrib/apache/${PROJECT_NAME}.conf)
 	@ $(call SED_REPLACE_ALL,group1,$$USER,./contrib/apache/${PROJECT_NAME}.conf)
 	@ $(call SED_REPLACE_ALL_PATH,<path-to-project>,${PROJECT_DIR},./contrib/apache/${PROJECT_NAME}.conf)
-	@ sudo cp -u ${PYBOSSA_CONF} /etc/apache2/sites-available/${VLIBRAS_NAME}.conf
-	@ if grep -q "${PROJECT_NAME}" "/etc/apache2/sites-available/${VLIBRAS_NAME}.conf"; \
+	@ sudo cp -u "/etc/apache2/sites-available/pybossa.conf" /etc/apache2/sites-available/wikilibras.conf
+	@ if grep -q "WSGIScriptAlias /${PROJECT_NAME}" "/etc/apache2/sites-available/wikilibras.conf"; \
 	  then \
-	      echo "A previous WSGI daemon definition for '${PROJECT_NAME}' in: /etc/apache2/sites-available/${VLIBRAS_NAME}.conf"; \
+	      echo "\33[33;1mA previous WSGI daemon definition for '${PROJECT_NAME}' in: /etc/apache2/sites-available/wikilibras.conf\33[0m"; \
 	  else \
-	      sudo sed -i -e "/Header/,/VirtualHost>/d" /etc/apache2/sites-available/${VLIBRAS_NAME}.conf; \
+	      sudo sed -i -e "/Header/,/VirtualHost>/d" /etc/apache2/sites-available/wikilibras.conf; \
 	      sudo sed -n -e '/WSGIDaemonProcess/,/VirtualHost>/p' ./contrib/apache/${PROJECT_NAME}.conf | \
-	      sudo tee -a /etc/apache2/sites-available/${VLIBRAS_NAME}.conf > /dev/null; \
+	      sudo tee -a /etc/apache2/sites-available/wikilibras.conf > /dev/null; \
 	  fi
+
+apache:
 	@ sudo a2dissite pybossa.conf
-	@ sudo a2ensite ${VLIBRAS_NAME}.conf
+	@ sudo a2ensite wikilibras.conf
 	@ sudo apachectl configtest
+	@ sudo service apache2 start
 	@ sudo service apache2 reload
 
 clean:
 	@ find . -regextype posix-awk -regex "(.*.log|.*.pyc)" -type f -print -delete
 
-uninstall: clean
+uninstall:
 	@ rm -rf ./env/
+	$(MAKE) clean
 	@ rm -f ./settings_local.py
 	@ rm -f ./contrib/${PROJECT_NAME}.wsgi
-	@ sudo rm -f /etc/apache2/sites-available/${VLIBRAS_NAME}.conf
-	@ sudo rm -f /etc/apache2/sites-enabled/${VLIBRAS_NAME}.conf
+	@ sudo rm -f /etc/apache2/sites-available/wikilibras.conf
+	@ sudo rm -f /etc/apache2/sites-enabled/wikilibras.conf
 
 run:
 	@ ( \
 	    . ./env/bin/activate; \
 	    python main.py; \
-	 )
+	)
--
libgit2 0.21.2