From 491d3fbff384d4b04483b54e5bb78d23bb1181c5 Mon Sep 17 00:00:00 2001
From: Rory Dudley
Date: Thu, 28 Mar 2024 23:26:02 -0600
Subject: Remove hard-coded PATH

Use $PATH, instead of a hard-coded PATH from main(). This means that
there is no longer a need to pass around PATH to
repl()/recite()/path::refresh(), since path::refresh() can call env::var
directly.

Since the hard-coded paths were removed, there needs to be some way to
define $PATH. When running the debug build, dwvsh will look in
'dist/etc/dwvshrc' for the initial environment setup. For the release
target, dwvsh will look in '/etc/dwvshrc'. After the global rc file is
sourced, dwvsh will try to source ~/.dwvshrc if it exists, so users can
extend their environment without root access (assuming a release install).
---
 src/path.rs | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'src/path.rs')

diff --git a/src/path.rs b/src/path.rs
index 2953982..f201f53 100644
--- a/src/path.rs
+++ b/src/path.rs
@@ -1,37 +1,43 @@
+use std::env;
 use std::fs;
-use std::path::Path;
 
 /// Refresh the shell's $PATH
 ///
 /// This function caches all valid paths within within the directories
 /// specified.
 ///
-/// # Arguments
-/// * `path` - A reference to a vector that holds a list to the shell $PATHs
-///
 /// # Returns
 /// * `bins: Vec<String>` - A new cache of all valid file paths in $PATH
 ///
 /// # Examples
 /// ```
-/// let path = vec!["/bin"];
-/// let path = path.into_iter().map(Path::new).collect();
-/// let mut bins = path::refresh(&path);
+/// let mut bins = path::refresh();
 /// ...
 /// // A situation occurs where the $PATH needs to be refreshed
-/// bins = path::refresh(&path)
+/// bins = path::refresh()
 /// ```
-pub fn refresh(path: &Vec<&Path>) -> Vec<String> {
-    let mut bins: Vec<String> = Vec::new();
+pub fn refresh() -> Vec<String> {
+    let mut bins = Vec::new();
+    let path = env::var("PATH").unwrap_or(String::new());
+    let mut path = path.split(':');
+
+    loop {
+        let p = match path.next() {
+            Some(p) => p,
+            None => break,
+        };
 
-    for p in path {
         let files = match fs::read_dir(p) {
             Ok(files) => files,
             Err(_) => continue,
         };
 
         for file in files {
-            bins.push(file.unwrap().path().display().to_string());
+            let f = match file {
+                Ok(f) => f,
+                Err(_) => continue,
+            };
+            bins.push(f.path().display().to_string());
         }
     }
 
-- 
cgit v1.2.3