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/source.rs | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
(limited to 'src/poem/anthology')
diff --git a/src/poem/anthology/source.rs b/src/poem/anthology/source.rs
index 1449994..f7b9a0b 100644
--- a/src/poem/anthology/source.rs
+++ b/src/poem/anthology/source.rs
@@ -1,9 +1,8 @@
use crate::poem::Verse;
use crate::poem::{read::Readable, recite::Reciteable, Poem};
use std::fs;
-use std::path::Path;
-pub fn incant(verse: &Verse, path: &Vec<&Path>, bins: &mut Vec<String>) -> i32 {
+pub fn incant(verse: &Verse, bins: &mut Vec<String>) -> i32 {
let files = match verse.clause() {
Some(clause) => clause,
None => {
@@ -14,7 +13,7 @@ pub fn incant(verse: &Verse, path: &Vec<&Path>, bins: &mut Vec<String>) -> i32 {
for file in files {
let poetry = match fs::read_to_string(&file) {
- Ok(contents) => contents,
+ Ok(poetry) => poetry,
Err(e) => {
eprintln!(
"source: could not load {}: {}",
@@ -33,7 +32,7 @@ pub fn incant(verse: &Verse, path: &Vec<&Path>, bins: &mut Vec<String>) -> i32 {
}
};
- match poem.recite(path, bins, None) {
+ match poem.recite(bins, None) {
Ok(_) => {}
Err(e) => {
eprintln!("dwvsh: {}", e.to_string().to_lowercase());
--
cgit v1.2.3