replace references to cache_dir with data_dir

tsloughter · Aug 26, 2024 · b26c9d2 · b26c9d2
1 parent 9c9c856
commit b26c9d2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/config.rs b/src/config.rs
@@ -204,8 +204,8 @@ pub fn language_release_dir(
     id: &String,
     force: &Option<bool>,
 ) -> Result<PathBuf> {
-    let cache_dir = dirs::data_local_dir();
-    let release_dir = cache_dir
+    let data_dir = dirs::data_local_dir();
+    let release_dir = data_dir
         .unwrap()
         .join("beamup")
         .join(language.to_string())
@@ -246,20 +246,20 @@ pub fn home_config_file() -> Result<String> {
         Some(d) => d,
         None => return Err(eyre!("no home directory available")),
     };
-    let cache_dir = match dirs::data_local_dir() {
+    let data_dir = match dirs::data_local_dir() {
         Some(d) => d,
         None => return Err(eyre!("no home directory available")),
     };
 
     let default_config = config_dir.join("beamup").join(CONFIG_FILE);
-    let default_cache = cache_dir.join("beamup");
+    let default_data = data_dir.join("beamup");
 
     let _ = fs::create_dir_all(config_dir.join("beamup"));
-    let _ = fs::create_dir_all(cache_dir.join("beamup"));
+    let _ = fs::create_dir_all(data_dir.join("beamup"));
 
     if !default_config.exists() {
         let config = Config {
-            install_dir: default_cache.to_str().unwrap().to_string(),
+            install_dir: default_data.to_str().unwrap().to_string(),
             erlang: Some(LanguageConfig {
                 default: None,
                 installs: toml::Table::new(),

diff --git a/src/main.rs b/src/main.rs
@@ -218,6 +218,7 @@ fn handle_command(_bin_path: PathBuf) -> Result<(), Report> {
         // }
         SubCommands::Releases(ReleasesArgs { language, .. }) => {
             debug!("running releases: repo={:?}", language);
+            // TODO: should return Result type
             cmd::releases::run(language);
             Ok(())
         }
@@ -242,16 +243,17 @@ fn handle_command(_bin_path: PathBuf) -> Result<(), Report> {
             let github_repo = languages::get_github_repo(language);
 
             let dir = cmd::install::run(language, &github_repo, release, id, repo, force)?;
-            let _ = cmd::update_links::run(Some(language))?;
+            cmd::update_links::run(Some(language))?;
 
+            // TODO: should return Result type
             config::add_install(language, id, dir, config_file, config);
 
             Ok(())
         }
         SubCommands::UpdateLinks => {
             debug!("running update-links");
 
-            let _ = cmd::update_links::run(None)?;
+            cmd::update_links::run(None)?;
 
             info!("Updated links of language binaries to current beamup install");
 
@@ -313,7 +315,9 @@ fn handle_command(_bin_path: PathBuf) -> Result<(), Report> {
 
             info!("Building {:?} for ref={} id={}", language, git_ref, id);
 
-            let _ = cmd::update_links::run(Some(language))?;
+            cmd::update_links::run(Some(language))?;
+
+            // TODO: this should Result type
             config::add_install(language, &id, dir, config_file, config);
 
             Ok(())