aboutsummaryrefslogtreecommitdiffhomepage
path: root/GNUmakefile
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2020-03-28 16:49:29 +0100
committerGitHub <noreply@github.com>2020-03-28 16:49:29 +0100
commit11079d204d865671524dad0c7f418deef29a8c83 (patch)
tree103794af0a224c0d0f49b7d06c99cf2ba7c6febe /GNUmakefile
parentd8a40d703e96c10118de025eb5cdcfdd69f26f6a (diff)
parent33e3eeaec851158289e1a236cfe08a475cc6364a (diff)
downloadwallabag-11079d204d865671524dad0c7f418deef29a8c83.tar.gz
wallabag-11079d204d865671524dad0c7f418deef29a8c83.tar.zst
wallabag-11079d204d865671524dad0c7f418deef29a8c83.zip
Merge pull request #4272 from Simounet/feat/load-custom-css-only-if-exists
Load custom.css only if exists
Diffstat (limited to 'GNUmakefile')
-rwxr-xr-xGNUmakefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 837f7103..d0894dbb 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -17,14 +17,14 @@ help: ## Display this help menu
17clean: ## Clear the application cache 17clean: ## Clear the application cache
18 rm -rf var/cache/* 18 rm -rf var/cache/*
19 19
20install: customcss ## Install wallabag with the latest version 20install: ## Install wallabag with the latest version
21 @./scripts/install.sh $(ENV) 21 @./scripts/install.sh $(ENV)
22 22
23update: ## Update the wallabag installation to the latest version 23update: ## Update the wallabag installation to the latest version
24 @./scripts/update.sh $(ENV) 24 @./scripts/update.sh $(ENV)
25 25
26dev: ENV=dev 26dev: ENV=dev
27dev: build customcss ## Install the latest dev version 27dev: build ## Install the latest dev version
28 @./scripts/dev.sh 28 @./scripts/dev.sh
29 29
30run: ## Run the wallabag built-in server 30run: ## Run the wallabag built-in server
@@ -34,9 +34,6 @@ build: ## Run webpack
34 @npm install 34 @npm install
35 @npm run build:$(ENV) 35 @npm run build:$(ENV)
36 36
37customcss:
38 @touch web/custom.css
39
40prepare: clean ## Prepare database for testsuite 37prepare: clean ## Prepare database for testsuite
41ifdef DB 38ifdef DB
42 cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml 39 cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml