From dec419f443162be3e23ffef54ea09710849d169b Mon Sep 17 00:00:00 2001 From: Ariel Otilibili Date: Mon, 23 Sep 2024 22:42:21 +0200 Subject: [PATCH] Refactored `webui*` rules * part of #2906 * output is unchanged. ``` $ git log --oneline -n1 --pretty=short commit f2f97e2f (HEAD -> makefile) Author: Ariel Otilibili Refactored `webui*` rules $ make webui -n >> /tmp/makefile; echo $? 0 $ make webui-audit -n >> /tmp/makefile; echo $? 0 $ make webui-audit-fix -n >> /tmp/makefile; echo $? 0 $ git switch develop Switched to branch 'develop' Your branch is up to date with 'origin/develop'. $ git log --oneline -n1 --pretty=short commit 24c87253 (HEAD -> develop, origin/develop, origin/HEAD) Merge: 42af55b3 fa7fc5bd Author: Nicolas Hennion Merge pull request #2941 from ariel-anieli/refactor-alert $ make webui -n >> /tmp/develop; echo $? 0 $ make webui-audit -n >> /tmp/develop; echo $? 0 $ make webui-audit-fix -n >> /tmp/develop; echo $? 0 $ diff /tmp/develop /tmp/makefile; echo $? 0 ``` Signed-off-by: Ariel Otilibili --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 94ca286d2c..1ed64e3565 100644 --- a/Makefile +++ b/Makefile @@ -203,14 +203,16 @@ install: ## Open a Web Browser to the installation procedure # Follow ./glances/outputs/static/README.md for more information # =================================================================== +webui webui%: DIR = glances/outputs/static/ + webui: ## Build the Web UI - cd glances/outputs/static/ && npm ci && npm run build + cd $(DIR) && npm ci && npm run build webui-audit: ## Audit the Web UI - cd glances/outputs/static/ && npm audit + cd $(DIR) && npm audit webui-audit-fix: ## Fix audit the Web UI - cd glances/outputs/static/ && npm audit fix && npm ci && npm run build + cd $(DIR) && npm audit fix && npm ci && npm run build # =================================================================== # Packaging