From f6a45e91c5e5965a03ce0a956fcc76ca12aa8b8c Mon Sep 17 00:00:00 2001 From: Turiiya Date: Fri, 12 Apr 2024 00:08:09 +0200 Subject: [PATCH] cleanup --- cmd/tools/vpm/vcs.v | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/cmd/tools/vpm/vcs.v b/cmd/tools/vpm/vcs.v index c27cc6e0262e80..2b65ec6f2308c1 100644 --- a/cmd/tools/vpm/vcs.v +++ b/cmd/tools/vpm/vcs.v @@ -26,15 +26,11 @@ const vcs_info = init_vcs_info() or { } fn init_vcs_info() !map[VCS]VCSInfo { + git_installed_raw_ver := os.execute_opt('git --version')!.output.all_after_last(' ').trim_space() + git_installed_ver := semver.from(git_installed_raw_ver)! + git_submod_filter_ver := semver.from('2.36.0')! mut git_install_cmd := 'clone --depth=1 --recursive --shallow-submodules --filter=blob:none' - submod_filter_version := semver.from('2.36.0') or { panic(err) } - raw_installed_git_ver := os.execute_opt('git --version') or { - return error('failed to find git') - }.output.all_after_last(' ').trim_space() - installed_git_ver := semver.from(raw_installed_git_ver) or { - return error('failed to parse git version `${raw_installed_git_ver}`') - } - if installed_git_ver >= submod_filter_version { + if git_installed_ver >= git_submod_filter_ver { git_install_cmd += ' --also-filter-submodules' } return {