X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=GNUmakefile;h=d0894dbbf85c9637120e47e0a4d22ae3f1db0f9a;hb=a29a15c98da1ffa78f7cc52e7906b904fcffc144;hp=db87c5d210ee114d18a26dda018e728765912bf8;hpb=49eb5405debb49d19c58f966b4fceac9ea9571ae;p=github%2Fwallabag%2Fwallabag.git diff --git a/GNUmakefile b/GNUmakefile index db87c5d2..d0894dbb 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -3,12 +3,9 @@ TMP_FOLDER=/tmp RELEASE_FOLDER=wllbg-release # ensure the ENV variable is well defined -ifeq ($(origin ENV), prod) - # all good ("prod" is a valid env) -else ifeq ($(origin ENV), dev) - # all good ("dev" is a valid env) -else ifeq ($(origin ENV), test) - # all good ("test" is a valid env) +AVAILABLE_ENV := prod dev test +ifneq ($(filter $(ENV),$(AVAILABLE_ENV)),) + # all good else # not good, force it to "prod" override ENV = prod @@ -20,14 +17,14 @@ help: ## Display this help menu clean: ## Clear the application cache rm -rf var/cache/* -install: customcss ## Install wallabag with the latest version +install: ## Install wallabag with the latest version @./scripts/install.sh $(ENV) update: ## Update the wallabag installation to the latest version @./scripts/update.sh $(ENV) dev: ENV=dev -dev: build customcss ## Install the latest dev version +dev: build ## Install the latest dev version @./scripts/dev.sh run: ## Run the wallabag built-in server @@ -37,9 +34,6 @@ 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