From 5620810c55ea7e4d440f4eb6b5019a280c3eac76 Mon Sep 17 00:00:00 2001
From: Jiahao XU <Jiahao_XU@outlook.com>
Date: Sat, 23 Jul 2022 18:36:01 +1000
Subject: [PATCH] Simplify `get_install_path` using `cargo_home`

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---
 src/helpers.rs | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/helpers.rs b/src/helpers.rs
index 570b243e..d70df19b 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -187,20 +187,9 @@ pub fn get_install_path<P: AsRef<Path>>(install_path: Option<P>) -> (Option<Path
         return (Some(b.join("bin")), true);
     }
 
-    if let Ok(p) = std::env::var("CARGO_HOME") {
-        debug!("using CARGO_HOME ({p})");
-        let b = PathBuf::from(p);
-        return (Some(b.join("bin")), false);
-    }
-
-    // Standard $HOME/.cargo/bin
-    if let Some(d) = dirs::home_dir() {
-        let d = d.join(".cargo/bin");
-        if d.exists() {
-            debug!("using $HOME/.cargo/bin");
-
-            return (Some(d), false);
-        }
+    if let Ok(p) = cargo_home() {
+        debug!("using ({}) as cargo home", p.display());
+        return (Some(p.into()), false);
     }
 
     // Local executable dir if no cargo is found