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

symlink: remove broken defer (#6428)

pull/6429/head
spaceface777 2020-09-19 22:26:32 +02:00 committed by GitHub
parent 9958881cbe
commit 44deb43252
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/tools/vsymlink.v
View File

@ -80,10 +80,11 @@ fn setup_symlink_windows(vexe string){
warn_and_exit(err) warn_and_exit(err)
return return
} }
defer { // TODO: Fix defers inside ifs
C.RegCloseKey(reg_sys_env_handle) // defer {
} // C.RegCloseKey(reg_sys_env_handle)
// }
// if the above succeeded, and we cannot get the value, it may simply be empty // if the above succeeded, and we cannot get the value, it may simply be empty
sys_env_path := get_reg_value(reg_sys_env_handle, 'Path') or { '' } sys_env_path := get_reg_value(reg_sys_env_handle, 'Path') or { '' }
@ -104,6 +105,7 @@ fn setup_symlink_windows(vexe string){
print('not configured.\nAdding symlink directory to system %PATH%...') print('not configured.\nAdding symlink directory to system %PATH%...')
set_reg_value(reg_sys_env_handle, 'Path', new_sys_env_path) or { set_reg_value(reg_sys_env_handle, 'Path', new_sys_env_path) or {
warn_and_exit(err) warn_and_exit(err)
C.RegCloseKey(reg_sys_env_handle)
return return
} }
println('done.') println('done.')
@ -113,9 +115,11 @@ fn setup_symlink_windows(vexe string){
send_setting_change_msg('Environment') or { send_setting_change_msg('Environment') or {
eprintln('\n' + err) eprintln('\n' + err)
warn_and_exit('You might need to run this again to have the `v` command in your %PATH%') warn_and_exit('You might need to run this again to have the `v` command in your %PATH%')
C.RegCloseKey(reg_sys_env_handle)
return return
} }
C.RegCloseKey(reg_sys_env_handle)
println('finished.\n\nNote: restart your shell/IDE to load the new %PATH%.') println('finished.\n\nNote: restart your shell/IDE to load the new %PATH%.')
println('After restarting your shell/IDE, give `v version` a try in another dir!') println('After restarting your shell/IDE, give `v version` a try in another dir!')
} }