refactor: simplify path handling, remove unused utils

vlang · Mar 17, 2024 · 77979d0 · 77979d0
1 parent 59d104a
commit 77979d0
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 29 deletions.
diff --git a/config/constants.v b/config/constants.v
@@ -1,7 +1,6 @@
 module config
 
 import os
-import utils
 
 // analyzer_name is the name of the analyzer.
 pub const analyzer_name = 'v-analyzer'
@@ -11,7 +10,7 @@ pub const analyzer_config_name = 'config.toml'
 
 // analyzer_configs_path is the path to the directory containing the
 // root configuration files for the analyzer.
-pub const analyzer_configs_path = utils.expand_tilde_to_home('~/.config/v-analyzer')
+pub const analyzer_configs_path = os.join_path(os.home_dir(), '.config', 'v-analyzer')
 
 // analyzer_local_configs_folder_name is the name of the directory
 // containing the local configuration files for the analyzer.

diff --git a/project/flavors/SymlinkToolchainFlavor.v b/project/flavors/SymlinkToolchainFlavor.v
@@ -1,12 +1,11 @@
 module flavors
 
 import os
-import utils
 
 pub struct SymlinkToolchainFlavor {}
 
 fn (s &SymlinkToolchainFlavor) get_home_page_candidates() []string {
-	symlink_path_candidates := ['/usr/local/bin/v', utils.expand_tilde_to_home('~/.local/bin/v')]
+	symlink_path_candidates := ['/usr/local/bin/v', '${os.home_dir()}/.local/bin/v')]
 
 	mut result := []string{}
 

diff --git a/src/up.v b/src/up.v
@@ -2,10 +2,11 @@ module main
 
 import cli
 import term
-import utils
+import os
 
 pub const analyzer_install_script_download_path = 'https://raw.githubusercontent.com/vlang/v-analyzer/main/install.vsh'
-pub const analyzer_install_script_path = utils.expand_tilde_to_home('~/.config/v-analyzer/install.vsh')
+pub const analyzer_install_script_path = os.join_path(os.home_dir(), '.config', 'v-analyzer',
+	'install.vsh')
 
 fn up_cmd(cmd cli.Command) ! {
 	download_install_vsh()!

diff --git a/utils/os_utils.v b/utils/os_utils.v
diff --git a/utils/os_utils_default.c.v b/utils/os_utils_default.c.v
diff --git a/utils/os_utils_windows.c.v b/utils/os_utils_windows.c.v