summaryrefslogtreecommitdiffstats
path: root/src/compose.rs
diff options
context:
space:
mode:
authorRory Dudley2024-03-28 23:26:02 -0600
committerRory Dudley2024-03-28 23:26:02 -0600
commit491d3fbff384d4b04483b54e5bb78d23bb1181c5 (patch)
tree470b0fc2ab0a476d682e104bdb03275ffd6b8671 /src/compose.rs
parent14a74aea0f02da53e0f61c572da2c5244ed80551 (diff)
downloaddwarvish-491d3fbff384d4b04483b54e5bb78d23bb1181c5.tar.gz
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).
Notes
Notes: Throughout a lot of this program, we're calling `env!("HOME")`, in order to get the user's home directory. Technically, this is not correct. The env!() macro resolves environment variables during compile time, while env::var() gets environment variables for the running process (i.e. the shell). See https://users.rust-lang.org/t/env-vs-env-var/88119 for more info. In the near future, this will need to be addressed. Might be worth looking into what other shells do, though one idea I had was to invoke '/usr/bin/id', grab the user's ID, and use it to grab the rest of the info from /etc/passwd. This would be handled in an /etc/dwvlogin or /etc/dwvprofile most likely.
Diffstat (limited to 'src/compose.rs')
-rw-r--r--src/compose.rs58
1 files changed, 58 insertions, 0 deletions
diff --git a/src/compose.rs b/src/compose.rs
new file mode 100644
index 0000000..8c4b3ea
--- /dev/null
+++ b/src/compose.rs
@@ -0,0 +1,58 @@
+use crate::poem::{read::Readable, recite::Reciteable, Poem};
+use std::fs;
+use std::path::PathBuf;
+
+pub fn env() {
+ // Use local repo path if running the debug target
+ let global_rc = if cfg!(debug_assertions) {
+ let mut base = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+ base.push("dist/etc/dwvshrc");
+ base
+ } else {
+ PathBuf::from("/etc/dwvshrc")
+ };
+
+ // User defined rc file in ~
+ let mut local_rc = PathBuf::from(env!("HOME"));
+ local_rc.push(".dwvshrc");
+
+ // Read, read, and recite
+ rrr(global_rc);
+ rrr(local_rc);
+}
+
+fn rrr(path: PathBuf) {
+ let poetry = match fs::read_to_string(&path) {
+ Ok(poetry) => poetry,
+ Err(e) => {
+ if path.to_string_lossy().contains("etc/dwvshrc") {
+ eprintln!(
+ "dwvsh: unable to read global dwvshrc file: {}",
+ e.to_string().to_lowercase()
+ );
+ }
+ return;
+ }
+ };
+
+ let poem = match Poem::read(poetry) {
+ Ok(poem) => poem,
+ Err(e) => {
+ eprintln!(
+ "dwvsh: error in {}: {}",
+ path.display(),
+ e.to_string().to_lowercase()
+ );
+ return;
+ }
+ };
+
+ let mut bins = vec![];
+ match poem.recite(&mut bins, None) {
+ Ok(_) => {}
+ Err(e) => {
+ eprintln!("dwvsh: {}", e.to_string().to_lowercase());
+ return;
+ }
+ }
+}