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/poem/anthology.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/poem/anthology.rs')

diff --git a/src/poem/anthology.rs b/src/poem/anthology.rs
index 2781081..b9e747c 100644
--- a/src/poem/anthology.rs
+++ b/src/poem/anthology.rs
@@ -3,7 +3,6 @@ pub mod exit;
 pub mod export;
 pub mod source;
 use crate::poem::Verse;
-use std::path::Path;
 
 /// A static list of all the built-in commands
 static INDEX: [&str; 4] = ["cd", "exit", "export", "source"];
@@ -20,13 +19,13 @@ pub fn lookup(verb: &str) -> Option<usize> {
     INDEX.iter().position(|v| v.to_string() == verb)
 }
 
-pub fn incant(verse: &Verse, index: usize, path: &Vec<&Path>, bins: &mut Vec<String>) -> i32 {
+pub fn incant(verse: &Verse, index: usize, bins: &mut Vec<String>) -> i32 {
     let verb = INDEX[index];
     match verb {
         "cd" => cd::incant(verse),
         "exit" => exit::incant(),
         "export" => export::incant(verse),
-        "source" => source::incant(verse, path, bins),
+        "source" => source::incant(verse, bins),
         _ => unreachable!(),
     }
 }
-- 
cgit v1.2.3