vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

tools: improve the diagnostic messages from `v up` and `v self` even more

pull/8386/head
Delyan Angelov 2021-01-28 00:45:38 +02:00
parent 242d7d0fc0
commit 924fd2bf2a
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/tools/vself.v
View File

@ -42,16 +42,19 @@ fn compile(vroot string, cmd string) {
fn backup_old_version_and_rename_newer() ?bool {
mut errors := []string{}
v_file := if os.user_os() == 'windows' { 'v.exe' } else { 'v' }
v2_file := if os.user_os() == 'windows' { 'v2.exe' } else { 'v2' }
bak_file := if os.user_os() == 'windows' { 'v_old.exe' } else { 'v_old' }
short_v_file := if os.user_os() == 'windows' { 'v.exe' } else { 'v' }
short_v2_file := if os.user_os() == 'windows' { 'v2.exe' } else { 'v2' }
short_bak_file := if os.user_os() == 'windows' { 'v_old.exe' } else { 'v_old' }
v_file := os.real_path(short_v_file)
v2_file := os.real_path(short_v2_file)
bak_file := os.real_path(short_bak_file)
if os.exists(bak_file) {
os.rm(bak_file) or { errors << 'failed removing $bak_file: $err' }
}
os.mv(v_file, bak_file) or { errors << err }
os.mv(v2_file, v_file) or { errors << err }
os.mv(v2_file, v_file) or { panic(err) }
if errors.len > 0 {
return error('backup errors:\n >> ' + errors.join('\n >> '))
eprintln('backup errors:\n >> ' + errors.join('\n >> '))
}
return true
}

2
cmd/tools/vup.v
View File

@ -108,7 +108,7 @@ fn (app App) show_current_v_version() {
fn (app App) backup(file string) {
backup_file := '${file}_old.exe'
if os.exists(backup_file) {
os.rm(backup_file) or { panic(err) }
os.rm(backup_file) or { eprintln('failed removing $backup_file: $err') }
}
os.mv(file, backup_file) or { panic(err) }
}