diff options
| author | silverwind <me@silverwind.io> | 2023-05-24 22:11:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-24 20:11:04 +0000 |
| commit | 1cf4d46bb194f236b3e0157bc2ec2583014cfa2e (patch) | |
| tree | 2bfb946e6860771db32464888b984fa248187be6 | |
| parent | 395bb33e4c9712e570f597c3ca24a4c3c6acdaff (diff) | |
| download | gitea-1cf4d46bb194f236b3e0157bc2ec2583014cfa2e.tar.gz gitea-1cf4d46bb194f236b3e0157bc2ec2583014cfa2e.zip | |
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
```
| -rw-r--r-- | .air.toml | 2 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | build/watch.sh | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -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"] @@ -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 61e3dc40a2..5e8defa49c 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 |