From edded91b9f6c49ae08b5ee39dafba6ada7bb4cb6 Mon Sep 17 00:00:00 2001
From: Sergio Gasquez <sergio.gasquez@gmail.com>
Date: Mon, 16 Jan 2023 11:04:04 +0000
Subject: [PATCH] =?UTF-8?q?style:=20=F0=9F=94=8A=20Add=20source=20instruct?=
 =?UTF-8?q?ions=20at=20the=20end=20of=20the=20log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.rs | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 537d9cf..b42bce3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -272,11 +272,11 @@ async fn install(args: InstallOpts) -> Result<()> {
         clear_dist_folder()?;
     }
 
-    export_environment(&export_file, &exports)?;
+    create_export_file(&export_file, &exports)?;
 
     let config = Config {
         esp_idf_version: args.esp_idf_version,
-        export_file: Some(export_file),
+        export_file: Some(export_file.clone()),
         extra_crates: extra_crates.as_ref().map(|extra_crates| {
             extra_crates
                 .iter()
@@ -298,10 +298,7 @@ async fn install(args: InstallOpts) -> Result<()> {
     config_file.save()?;
 
     info!("{} Installation successfully completed!", emoji::CHECK);
-    warn!(
-        "{} Please, source the export file, as stated above, to properly setup the environment!",
-        emoji::WARN
-    );
+    export_environment(&export_file)?;
     Ok(())
 }
 
@@ -479,7 +476,7 @@ fn get_export_file(export_file: Option<PathBuf>) -> Result<PathBuf, Error> {
 }
 
 /// Creates the export file with the necessary environment variables.
-fn export_environment(export_file: &PathBuf, exports: &[String]) -> Result<(), Error> {
+fn create_export_file(export_file: &PathBuf, exports: &[String]) -> Result<(), Error> {
     info!("{} Creating export file", emoji::WRENCH);
     let mut file = File::create(export_file)?;
     for e in exports.iter() {
@@ -488,6 +485,12 @@ fn export_environment(export_file: &PathBuf, exports: &[String]) -> Result<(), E
         file.write_all(e.as_bytes())?;
         file.write_all(b"\n")?;
     }
+
+    Ok(())
+}
+
+/// Instructions to export the environment variables.
+fn export_environment(export_file: &PathBuf) -> Result<(), Error> {
     #[cfg(windows)]
     warn!(
         "{} PLEASE set up the environment variables running: '{}'",
@@ -504,6 +507,7 @@ fn export_environment(export_file: &PathBuf, exports: &[String]) -> Result<(), E
         "{} This step must be done every time you open a new terminal.",
         emoji::WARN
     );
+
     Ok(())
 }
 
@@ -527,7 +531,7 @@ pub fn check_arguments(
 
 #[cfg(test)]
 mod tests {
-    use crate::{export_environment, get_export_file, DEFAULT_EXPORT_FILE};
+    use crate::{create_export_file, get_export_file, DEFAULT_EXPORT_FILE};
     use directories::BaseDirs;
     use std::{env::current_dir, path::PathBuf};
 
@@ -556,7 +560,7 @@ mod tests {
     }
 
     #[test]
-    fn test_export_environment() {
+    fn test_create_export_file() {
         // Creates the export file and writes the correct content to it
         let temp_dir = tempfile::TempDir::new().unwrap();
         let export_file = temp_dir.path().join("export.sh");
@@ -564,7 +568,7 @@ mod tests {
             "export VAR1=value1".to_string(),
             "export VAR2=value2".to_string(),
         ];
-        export_environment(&export_file, &exports).unwrap();
+        create_export_file(&export_file, &exports).unwrap();
         let contents = std::fs::read_to_string(export_file).unwrap();
         assert_eq!(contents, "export VAR1=value1\nexport VAR2=value2\n");
 
@@ -576,6 +580,6 @@ mod tests {
             "export VAR1=value1".to_string(),
             "export VAR2=value2".to_string(),
         ];
-        assert!(export_environment(&export_file, &exports).is_err());
+        assert!(create_export_file(&export_file, &exports).is_err());
     }
 }