mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

vup: hide some output when not in verbose mode (#7477)

Browse Source
This commit is contained in:
spaceface 2020-12-22 23:42:23 +01:00 committed by GitHub
parent 51a328f28d
commit a47749b204
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/tools/vup.v
View File

@ -36,9 +36,7 @@ fn main() {
app.backup('cmd/tools/vup.exe') app.backup('cmd/tools/vup.exe')
} }
app.recompile_v() app.recompile_v()
os.exec('"$app.vexe" cmd/tools/vup.v') or { os.exec('"$app.vexe" cmd/tools/vup.v') or { panic(err) }
panic(err)
}
app.show_current_v_version() app.show_current_v_version()
} }
@ -66,9 +64,12 @@ fn (app App) recompile_v() {
println('> recompiling v itself with `$vself` ...') println('> recompiling v itself with `$vself` ...')
} }
if self_result := os.exec(vself) { if self_result := os.exec(vself) {
println(self_result.output.trim_space())
if self_result.exit_code == 0 { if self_result.exit_code == 0 {
println(self_result.output.trim_space())
return return
} else if app.is_verbose {
println('`$vself` failed, running `make`...')
println(self_result.output.trim_space())
} }
} }
app.make(vself) app.make(vself)
@ -79,11 +80,10 @@ fn (app App) make(vself string) {
$if windows { $if windows {
make = 'make.bat' make = 'make.bat'
} }
println('`$vself` failed, running `$make`...') make_result := os.exec(make) or { panic(err) }
make_result := os.exec(make) or { if app.is_verbose {
panic(err)
}
println(make_result.output) println(make_result.output)
}
} }
fn (app App) show_current_v_version() { fn (app App) show_current_v_version() {
@ -111,9 +111,7 @@ fn (app App) backup(file string) {
} }
fn (app App) git_command(command string) { fn (app App) git_command(command string) {
git_result := os.exec('git $command') or { git_result := os.exec('git $command') or { panic(err) }
panic(err)
}
if git_result.exit_code != 0 { if git_result.exit_code != 0 {
if git_result.output.contains('Permission denied') { if git_result.output.contains('Permission denied') {
eprintln('No access to `$app.vroot`: Permission denied') eprintln('No access to `$app.vroot`: Permission denied')