From 1cf4d46bb194f236b3e0157bc2ec2583014cfa2e Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 24 May 2023 22:11:04 +0200 Subject: [PATCH] Reduce verbosity of dev commands (#24917) ### Before ``` $ make watch bash build/watch.sh make[1]: Entering directory '/Users/silverwind/git/gitea' make[1]: Entering directory '/Users/silverwind/git/gitea' GITEA_RUN_MODE=dev go run github.com/cosmtrek/air@v1.43.0 -c .air.toml rm -rf public/js public/css public/fonts public/img/webpack public/serviceworker.js NODE_ENV=development npx webpack --watch --progress ``` ### After ``` $ make watch GITEA_RUN_MODE=dev go run github.com/cosmtrek/air@v1.43.0 -c .air.toml NODE_ENV=development npx webpack --watch --progress ``` --- .air.toml | 2 +- Makefile | 4 ++-- build/watch.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.air.toml b/.air.toml index 6825118b95ed6..d13f8c4f99577 100644 --- a/.air.toml +++ b/.air.toml @@ -2,7 +2,7 @@ root = "." tmp_dir = ".air" [build] -cmd = "make backend" +cmd = "make --no-print-directory backend" bin = "gitea" delay = 1000 include_ext = ["go", "tmpl"] diff --git a/Makefile b/Makefile index fde7e990c5a32..6873cac811752 100644 --- a/Makefile +++ b/Makefile @@ -413,11 +413,11 @@ lint-editorconfig: .PHONY: watch watch: - bash build/watch.sh + @bash build/watch.sh .PHONY: watch-frontend watch-frontend: node-check node_modules - rm -rf $(WEBPACK_DEST_ENTRIES) + @rm -rf $(WEBPACK_DEST_ENTRIES) NODE_ENV=development npx webpack --watch --progress .PHONY: watch-backend diff --git a/build/watch.sh b/build/watch.sh index 61e3dc40a25bc..5e8defa49c89e 100644 --- a/build/watch.sh +++ b/build/watch.sh @@ -1,8 +1,8 @@ #!/bin/bash set -euo pipefail -make watch-frontend & -make watch-backend & +make --no-print-directory watch-frontend & +make --no-print-directory watch-backend & trap 'kill $(jobs -p)' EXIT wait