Merge pull request #1 from wallabag/master

Keep up with the master again

1 files changed, 15 insertions, 3 deletions

diff --git a/GNUmakefile b/GNUmakefile
index a04468cb..837f7103 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -2,7 +2,14 @@ SHELL=bash
 TMP_FOLDER=/tmp
 RELEASE_FOLDER=wllbg-release
 
-ENV ?= prod
+# ensure the ENV variable is well defined
+AVAILABLE_ENV := prod dev test
+ifneq ($(filter $(ENV),$(AVAILABLE_ENV)),)
+        # all good
+else
+        # not good, force it to "prod"
+        override ENV = prod
+endif
 
 help: ## Display this help menu
         @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
@@ -10,21 +17,26 @@ help: ## Display this help menu
 clean: ## Clear the application cache
         rm -rf var/cache/*
 
-install: ## Install wallabag with the latest version
+install: customcss ## Install wallabag with the latest version
         @./scripts/install.sh $(ENV)
 
 update: ## Update the wallabag installation to the latest version
         @./scripts/update.sh $(ENV)
 
-dev: ## Install the latest dev version
+dev: ENV=dev
+dev: build customcss ## Install the latest dev version
         @./scripts/dev.sh
 
 run: ## Run the wallabag built-in server
         @php bin/console server:run --env=dev
 
 build: ## Run webpack
+        @npm install
         @npm run build:$(ENV)
 
+customcss:
+        @touch web/custom.css
+
 prepare: clean ## Prepare database for testsuite
 ifdef DB
         cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml