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

vfmt: change all '$expr' to '${expr}' (#16428)

Browse Source
This commit is contained in:
yuyi
2022-11-15 21:53:13 +08:00
committed by GitHub
parent 56239b4a23
commit 017ace6ea7
859 changed files with 7156 additions and 7135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/tools/vup.v
View File

@ -44,7 +44,7 @@ fn main() {
if !app.recompile_v() {
app.show_current_v_version()
eprintln('Recompiling V *failed*.')
eprintln('Try running `$get_make_cmd_name()` .')
eprintln('Try running `${get_make_cmd_name()}` .')
exit(1)
}
app.recompile_vup()
@ -75,14 +75,14 @@ fn (app App) update_from_master() {
fn (app App) recompile_v() bool {
// Note: app.vexe is more reliable than just v (which may be a symlink)
opts := if app.is_prod { '-prod' } else { '' }
vself := '${os.quoted_path(app.vexe)} $opts self'
app.vprintln('> recompiling v itself with `$vself` ...')
vself := '${os.quoted_path(app.vexe)} ${opts} self'
app.vprintln('> recompiling v itself with `${vself}` ...')
self_result := os.execute(vself)
if self_result.exit_code == 0 {
println(self_result.output.trim_space())
return true
} else {
app.vprintln('`$vself` failed, running `make`...')
app.vprintln('`${vself}` failed, running `make`...')
app.vprintln(self_result.output.trim_space())
}
return app.make(vself)
@ -102,7 +102,7 @@ fn (app App) make(vself string) bool {
make := get_make_cmd_name()
make_result := os.execute(make)
if make_result.exit_code != 0 {
eprintln('> $make failed:')
eprintln('> ${make} failed:')
eprintln('> make output:')
eprintln(make_result.output)
return false
@ -117,30 +117,30 @@ fn (app App) show_current_v_version() {
mut vversion := vout.output.trim_space()
if vout.exit_code == 0 {
latest_v_commit := vversion.split(' ').last().all_after('.')
latest_v_commit_time := os.execute('git show -s --format=%ci $latest_v_commit')
latest_v_commit_time := os.execute('git show -s --format=%ci ${latest_v_commit}')
if latest_v_commit_time.exit_code == 0 {
vversion += ', timestamp: ' + latest_v_commit_time.output.trim_space()
}
}
println('Current V version: $vversion')
println('Current V version: ${vversion}')
}
}
fn (app App) backup(file string) {
backup_file := '${file}_old.exe'
if os.exists(backup_file) {
os.rm(backup_file) or { eprintln('failed removing $backup_file: $err.msg()') }
os.rm(backup_file) or { eprintln('failed removing ${backup_file}: ${err.msg()}') }
}
os.mv(file, backup_file) or { eprintln('failed moving $file: $err.msg()') }
os.mv(file, backup_file) or { eprintln('failed moving ${file}: ${err.msg()}') }
}
fn (app App) git_command(command string) {
app.vprintln('git_command: git $command')
git_result := os.execute('git $command')
app.vprintln('git_command: git ${command}')
git_result := os.execute('git ${command}')
if git_result.exit_code < 0 {
app.get_git()
// Try it again with (maybe) git installed
os.execute_or_exit('git $command')
os.execute_or_exit('git ${command}')
}
if git_result.exit_code != 0 {
eprintln(git_result.output)
@ -153,7 +153,7 @@ fn (app App) get_git() {
$if windows {
println('Downloading git 32 bit for Windows, please wait.')
// We'll use 32 bit because maybe someone out there is using 32-bit windows
res_download := os.execute('bitsadmin.exe /transfer "vgit" https://github.com/git-for-windows/git/releases/download/v2.30.0.windows.2/Git-2.30.0.2-32-bit.exe "$os.getwd()/git32.exe"')
res_download := os.execute('bitsadmin.exe /transfer "vgit" https://github.com/git-for-windows/git/releases/download/v2.30.0.windows.2/Git-2.30.0.2-32-bit.exe "${os.getwd()}/git32.exe"')
if res_download.exit_code != 0 {
eprintln('Unable to install git automatically: please install git manually')
panic(res_download.output)