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

vup: add quotes for the people with weird V paths (#6393)

pull/6399/head
Aqil Contractor 2020-09-16 19:00:56 -04:00 committed by GitHub
parent 6f7bb30b0a
commit a984f9cf97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/tools/vup.v
View File

@ -23,7 +23,7 @@ fn main() {
app := new_app() app := new_app()
os.chdir(app.vroot) os.chdir(app.vroot)
println('Updating V...') println('Updating V...')
app.update_from_master() app.update_from_master()
v_hash := util.githash(false) v_hash := util.githash(false)
current_hash := util.githash(true) current_hash := util.githash(true)
// println(v_hash) // println(v_hash)
@ -35,8 +35,8 @@ fn main() {
$if windows { $if windows {
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()
@ -45,7 +45,7 @@ fn main() {
fn (app App) update_from_master() { fn (app App) update_from_master() {
if app.is_verbose { if app.is_verbose {
println('> updating from master ...') println('> updating from master ...')
} }
if !os.exists('.git') { if !os.exists('.git') {
// initialize as if it had been cloned // initialize as if it had been cloned
app.git_command('init') app.git_command('init')
@ -61,10 +61,10 @@ fn (app App) update_from_master() {
fn (app App) recompile_v() { fn (app App) recompile_v() {
// NB: app.vexe is more reliable than just v (which may be a symlink) // NB: app.vexe is more reliable than just v (which may be a symlink)
vself := '$app.vexe self' vself := '"$app.vexe" self'
if app.is_verbose { if app.is_verbose {
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()) println(self_result.output.trim_space())
if self_result.exit_code == 0 { if self_result.exit_code == 0 {
@ -88,7 +88,7 @@ fn (app App) make(vself string) {
fn (app App) show_current_v_version() { fn (app App) show_current_v_version() {
println('Current V version:') println('Current V version:')
os.system('$app.vexe version') os.system('"$app.vexe" version')
} }
fn (app App) backup(file string) { fn (app App) backup(file string) {