minor changes

src/main.rs

@@ -1,68 +1,81 @@
-//  Rash
+use std::{
-//Rusty bASH
+    env,
-// Really Awesome SHell
+    io::{stdin, stdout, Write},
-use std::io::Write;
+    path::Path,
-use std::io::{stdin, stdout};
+    process::{Child, Command, Stdio},
+};
 
-use toml::Value;
-
-const VALUE: &str = "
-cursor='> '
-";
-
-const VERSION: &str = "0.1.0";
 fn main() {
-    let value = VALUE.parse::<Value>().unwrap();
-    let motd = "frick";
-    let terminal_cursor = value["cursor"].as_str();
-
-    println!("{}", value);
-
-    clear_term();
-    println!("{}", motd);
-
     loop {
-        print!("{}", terminal_cursor.unwrap());
+        // use the `>` character as the prompt
-        let _err = stdout().flush(); // Excplicitly flush to ensure > gets printed
+        // need to explicitly flush this to ensure it prints before read_line
-                                     // handle the _err
+
+        print!("~> ");
+        stdout().flush().unwrap();
+
         let mut input = String::new();
-        stdin().read_line(&mut input).unwrap(); // read_line leaves a trailing newline, which trim removes
+        stdin().read_line(&mut input).unwrap();
-        let command = input.trim();
+
+        // read_line leaves a trailing newline, which trim removes
+        // this needs to be peekable so we can determine when we are on the last command
+        let mut commands = input.trim().split(" | ").peekable();
+        let mut previous_command = None;
+
+        while let Some(command) = commands.next() {
+            // everything after the first whitespace character is interpreted as args to the command
+            let mut parts = command.trim().split_whitespace();
+            let command = parts.next().unwrap();
+            let args = parts;
+
             match command {
-            "rush" => {
+                "cd" => {
-                println!("Version: {}", VERSION);
+                    // default to '/' as new directory if one was not provided
-            } // Maybe parse via clap
+                    let new_dir = args.peekable().peek().map_or("/", |x| *x);
-            "clear()" | "clean()" => {
+                    let root = Path::new(new_dir);
-                clear_term();
+                    if let Err(e) = env::set_current_dir(&root) {
+                        eprintln!("{}", e);
                     }
-            "random()" => {
+
-                println!("1"); // this has been decided as the cryptographically secure random
+                    previous_command = None;
                 }
-            "script()" => {
+                "exit" => return,
-                let mut script = String::new();
+                command => {
-                loop {
+                    let stdin = previous_command.map_or(Stdio::inherit(), |output: Child| {
-                    let mut line = String::new();
+                        Stdio::from(output.stdout.unwrap())
-                    stdin().read_line(&mut line).unwrap(); // read_line leaves a trailing
+                    });
-                    line = line.trim().to_string();
+
-                    if line == "end()" {
+                    let stdout = if commands.peek().is_some() {
-                        println!("{}", script);
+                        // there is another command piped behind this one
-                        break;
+                        // prepare to send output to the next command
+                        Stdio::piped()
                     } else {
-                        // append line to script
+                        // there are no more commands piped behind this one
-                        script = format!("{}\n{}", script, line);
+                        // send output to shell stdout
+                        Stdio::inherit()
+                    };
+
+                    let output = Command::new(command)
+                        .args(args)
+                        .stdin(stdin)
+                        .stdout(stdout)
+                        .spawn();
+
+                    match output {
+                        Ok(output) => {
+                            previous_command = Some(output);
                         }
+                        Err(e) => {
+                            previous_command = None;
+                            eprintln!("{}", e);
                         }
-            }
+                    };
-            "ls" => {
-                println!("bonk");
-            }
-            _ => {
-                println!("Command {} not found", command);
-            }
                 }
             }
         }
 
-fn clear_term() {
+        if let Some(mut final_command) = previous_command {
-    print!("\x1B[2J\x1B[1;1H");
+            // block until the final command has finished
+            final_command.wait().unwrap();
+        }
+    }
 }