From dd1793d90fd39dfa29361745f2f7d259a7c4884f Mon Sep 17 00:00:00 2001
From: Vincent Ollivier <v@vinc.cc>
Date: Mon, 20 Jun 2022 19:59:44 +0200
Subject: [PATCH 01/12] Add shell aliases

---
 src/main.rs      |   3 +-
 src/usr/lisp.rs  |   3 +-
 src/usr/shell.rs | 301 +++++++++++++++++++++++++++++++----------------
 src/usr/time.rs  |   3 +-
 4 files changed, 200 insertions(+), 110 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 7b1921d1..85622aed 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,10 +14,9 @@ fn main(boot_info: &'static BootInfo) -> ! {
     print!("\x1b[?25h"); // Enable cursor
     loop {
         if let Some(cmd) = option_env!("MOROS_CMD") {
-            let mut env = usr::shell::default_env();
             let prompt = usr::shell::prompt_string(true);
             println!("{}{}", prompt, cmd);
-            usr::shell::exec(cmd, &mut env);
+            usr::shell::exec(cmd);
             sys::acpi::shutdown();
         } else {
             user_boot();
diff --git a/src/usr/lisp.rs b/src/usr/lisp.rs
index 78f6d852..80a3b2d0 100644
--- a/src/usr/lisp.rs
+++ b/src/usr/lisp.rs
@@ -294,8 +294,7 @@ fn default_env() -> Rc<RefCell<Env>> {
     data.insert("system".to_string(), Exp::Func(|args: &[Exp]| -> Result<Exp, Err> {
         ensure_length_eq!(args, 1);
         let cmd = string(&args[0])?;
-        let mut env = usr::shell::default_env();
-        let res = usr::shell::exec(&cmd, &mut env);
+        let res = usr::shell::exec(&cmd);
         Ok(Exp::Num(res as u8 as f64))
     }));
     data.insert("print".to_string(), Exp::Func(|args: &[Exp]| -> Result<Exp, Err> {
diff --git a/src/usr/shell.rs b/src/usr/shell.rs
index cd1a2d4c..4b3d42f0 100644
--- a/src/usr/shell.rs
+++ b/src/usr/shell.rs
@@ -28,6 +28,48 @@ pub enum ExitCode {
     ShellExit         = 255,
 }
 
+struct Config {
+    env: BTreeMap<String, String>,
+    aliases: BTreeMap<String, String>,
+}
+
+impl Config {
+    fn new() -> Config {
+        let mut env = BTreeMap::new();
+        for (key, val) in sys::process::envs() {
+            env.insert(key, val); // Copy the process environment to the shell environment
+        }
+        env.insert("DIR".to_string(), sys::process::dir());
+        let mut aliases = BTreeMap::new();
+        aliases.insert("p".to_string(),    "print".to_string());
+        aliases.insert("c".to_string(),    "copy".to_string());
+        aliases.insert("d".to_string(),    "delete".to_string());
+        aliases.insert("del".to_string(),  "delete".to_string());
+        aliases.insert("e".to_string(),    "edit".to_string());
+        aliases.insert("f".to_string(),    "find".to_string());
+        aliases.insert("g".to_string(),    "goto".to_string());
+        aliases.insert("go".to_string(),   "goto".to_string());
+        aliases.insert("h".to_string(),    "help".to_string());
+        aliases.insert("l".to_string(),    "list".to_string());
+        aliases.insert("m".to_string(),    "move".to_string());
+        aliases.insert("q".to_string(),    "quit".to_string());
+        aliases.insert("exit".to_string(), "quit".to_string());
+        aliases.insert("r".to_string(),    "read".to_string());
+        aliases.insert("w".to_string(),    "write".to_string());
+        aliases.insert("sh".to_string(),   "shell".to_string());
+        aliases.insert("dsk".to_string(),  "disk".to_string());
+        aliases.insert("mem".to_string(),  "memory".to_string());
+        aliases.insert("kbd".to_string(),  "keyboard".to_string());
+        //aliases.insert("cd".to_string(),   "goto".to_string());
+        //aliases.insert("rm".to_string(),   "delete".to_string());
+        //aliases.insert("ls".to_string(),   "list".to_string());
+        //aliases.insert("cp".to_string(),   "copy".to_string());
+        //aliases.insert("mv".to_string(),   "move".to_string());
+
+        Config { env, aliases }
+    }
+}
+
 fn autocomplete_commands() -> Vec<String> {
     let mut res = Vec::new();
     for cmd in AUTOCOMPLETE_COMMANDS {
@@ -79,19 +121,6 @@ pub fn prompt_string(success: bool) -> String {
     format!("{}>{} ", if success { csi_color } else { csi_error }, csi_reset)
 }
 
-pub fn default_env() -> BTreeMap<String, String> {
-    let mut env = BTreeMap::new();
-
-    // Copy the process environment to the shell environment
-    for (key, val) in sys::process::envs() {
-        env.insert(key, val);
-    }
-
-    env.insert("DIR".to_string(), sys::process::dir());
-
-    env
-}
-
 fn is_globbing(arg: &str) -> bool {
     let arg: Vec<char> = arg.chars().collect();
     let n = arg.len();
@@ -192,7 +221,7 @@ pub fn split_args(cmd: &str) -> Vec<String> {
     args
 }
 
-fn proc(args: &[&str]) -> ExitCode {
+fn cmd_proc(args: &[&str]) -> ExitCode {
     match args.len() {
         1 => {
             ExitCode::CommandSuccessful
@@ -222,7 +251,7 @@ fn proc(args: &[&str]) -> ExitCode {
     }
 }
 
-fn change_dir(args: &[&str], env: &mut BTreeMap<String, String>) -> ExitCode {
+fn cmd_change_dir(args: &[&str], config: &mut Config) -> ExitCode {
     match args.len() {
         1 => {
             println!("{}", sys::process::dir());
@@ -235,7 +264,7 @@ fn change_dir(args: &[&str], env: &mut BTreeMap<String, String>) -> ExitCode {
             }
             if api::fs::is_dir(&pathname) {
                 sys::process::set_dir(&pathname);
-                env.insert("DIR".to_string(), sys::process::dir());
+                config.env.insert("DIR".to_string(), sys::process::dir());
                 ExitCode::CommandSuccessful
             } else {
                 error!("File not found '{}'", pathname);
@@ -248,27 +277,97 @@ fn change_dir(args: &[&str], env: &mut BTreeMap<String, String>) -> ExitCode {
     }
 }
 
-pub fn exec(cmd: &str, env: &mut BTreeMap<String, String>) -> ExitCode {
+fn cmd_alias(args: &[&str], config: &mut Config) -> ExitCode {
+    let csi_option = Style::color("LightCyan");
+    let csi_title = Style::color("Yellow");
+    let csi_reset = Style::reset();
+    if args.len() == 1 {
+        println!("{}Usage:{} alias {}<key>=<val>{1}", csi_title, csi_reset, csi_option);
+        return usr::shell::ExitCode::CommandError;
+    } else {
+        for arg in args[1..].iter() {
+            if let Some(i) = arg.find('=') {
+                let (key, mut val) = arg.split_at(i);
+                val = &val[1..];
+                config.aliases.insert(key.to_string(), val.to_string());
+            } else {
+                error!("Error: could not parse '{}'", arg);
+                return usr::shell::ExitCode::CommandError;
+            }
+        }
+    }
+    ExitCode::CommandSuccessful
+}
+
+fn cmd_set(args: &[&str], config: &mut Config) -> ExitCode {
+    let csi_option = Style::color("LightCyan");
+    let csi_title = Style::color("Yellow");
+    let csi_reset = Style::reset();
+    if args.len() == 1 {
+        println!("{}Usage:{} set {}<key>=<val>{1}", csi_title, csi_reset, csi_option);
+        return usr::shell::ExitCode::CommandError;
+    } else {
+        for arg in args[1..].iter() {
+            if let Some(i) = arg.find('=') {
+                let (key, mut val) = arg.split_at(i);
+                val = &val[1..];
+                config.env.insert(key.to_string(), val.to_string());
+            } else {
+                error!("Error: could not parse '{}'", arg);
+                return usr::shell::ExitCode::CommandError;
+            }
+        }
+    }
+    ExitCode::CommandSuccessful
+}
+
+fn cmd_unset(args: &[&str], config: &mut Config) -> ExitCode {
+    let csi_option = Style::color("LightCyan");
+    let csi_title = Style::color("Yellow");
+    let csi_reset = Style::reset();
+    if args.len() == 1 {
+        println!("{}Usage:{} unset {}<key>{1}", csi_title, csi_reset, csi_option);
+        return usr::shell::ExitCode::CommandError;
+    } else {
+        for arg in args[1..].iter() {
+            if config.env.remove(&arg.to_string()).is_none() {
+                error!("Error: could not unset '{}'", arg);
+                return usr::shell::ExitCode::CommandError;
+            }
+        }
+    }
+    ExitCode::CommandSuccessful
+}
+
+fn exec_with_config(cmd: &str, config: &mut Config) -> ExitCode {
     let mut cmd = cmd.to_string();
 
     // Replace `$key` with its value in the environment or an empty string
     let re = Regex::new("\\$\\w+");
     while let Some((a, b)) = re.find(&cmd) {
         let key: String = cmd.chars().skip(a + 1).take(b - a - 1).collect();
-        let val = env.get(&key).map_or("", String::as_str);
+        let val = config.env.get(&key).map_or("", String::as_str);
         cmd = cmd.replace(&format!("${}", key), &val);
     }
 
     // Set env var like `foo=42` or `bar = "Hello, World!"
-    if Regex::new("^\\w+ *= *\\S*$").is_match(&cmd) {
-        let mut iter = cmd.splitn(2, '=');
-        let key = iter.next().unwrap_or("").trim().to_string();
-        let val = iter.next().unwrap_or("").trim().to_string();
-        env.insert(key, val);
-        return ExitCode::CommandSuccessful
+    if Regex::new("^\\w+ *= *\\S").is_match(&cmd) {
+        let i = cmd.find('=').unwrap();
+        let (key, mut val) = cmd.split_at(i);
+        val = &val[1..];
+        cmd = format!("set \"{}={}\"", key.trim(), val.trim().trim_matches('"'));
+    }
+
+    let mut args = split_args(&cmd);
+
+    // Replace command alias
+    if let Some(alias) = config.aliases.get(&args[0]) {
+        args.remove(0);
+        for arg in alias.split(' ').rev() {
+            args.insert(0, arg.to_string())
+        }
     }
 
-    let args = split_args(&cmd);
     let mut args: Vec<&str> = args.iter().map(String::as_str).collect();
 
     // Redirections like `print hello => /tmp/hello`
@@ -326,62 +425,51 @@ pub fn exec(cmd: &str, env: &mut BTreeMap<String, String>) -> ExitCode {
     }
 
     let res = match args[0] {
-        ""                     => ExitCode::CommandSuccessful,
-        "a"                    => ExitCode::CommandUnknown,
-        "b"                    => ExitCode::CommandUnknown,
-        "c" | "copy"           => usr::copy::main(&args),
-        "d" | "del" | "delete" => usr::delete::main(&args),
-        "e" | "edit"           => usr::editor::main(&args),
-        "f" | "find"           => usr::find::main(&args),
-        "g" | "go" | "goto"    => change_dir(&args, env),
-        "h" | "help"           => usr::help::main(&args),
-        "i"                    => ExitCode::CommandUnknown,
-        "j"                    => ExitCode::CommandUnknown,
-        "k"                    => ExitCode::CommandUnknown,
-        "l" | "list"           => usr::list::main(&args),
-        "m" | "move"           => usr::r#move::main(&args),
-        "n"                    => ExitCode::CommandUnknown,
-        "o"                    => ExitCode::CommandUnknown,
-        "q" | "quit" | "exit"  => ExitCode::ShellExit,
-        "r" | "read"           => usr::read::main(&args),
-        "s"                    => ExitCode::CommandUnknown,
-        "t"                    => ExitCode::CommandUnknown,
-        "u"                    => ExitCode::CommandUnknown,
-        "v"                    => ExitCode::CommandUnknown,
-        "w" | "write"          => usr::write::main(&args),
-        "x"                    => ExitCode::CommandUnknown,
-        "y"                    => ExitCode::CommandUnknown,
-        "z"                    => ExitCode::CommandUnknown,
-        "vga"                  => usr::vga::main(&args),
-        "sh" | "shell"         => usr::shell::main(&args),
-        "calc"                 => usr::calc::main(&args),
-        "base64"               => usr::base64::main(&args),
-        "date"                 => usr::date::main(&args),
-        "env"                  => usr::env::main(&args),
-        "hex"                  => usr::hex::main(&args),
-        "net"                  => usr::net::main(&args),
-        "dhcp"                 => usr::dhcp::main(&args),
-        "http"                 => usr::http::main(&args),
-        "httpd"                => usr::httpd::main(&args),
-        "socket"               => usr::socket::main(&args),
-        "tcp"                  => usr::tcp::main(&args),
-        "host"                 => usr::host::main(&args),
-        "install"              => usr::install::main(&args),
-        "geotime"              => usr::geotime::main(&args),
-        "colors"               => usr::colors::main(&args),
-        "dsk" | "disk"         => usr::disk::main(&args),
-        "user"                 => usr::user::main(&args),
-        "mem" | "memory"       => usr::memory::main(&args),
-        "kb" | "keyboard"      => usr::keyboard::main(&args),
-        "lisp"                 => usr::lisp::main(&args),
-        "chess"                => usr::chess::main(&args),
-        "beep"                 => usr::beep::main(&args),
-        "elf"                  => usr::elf::main(&args),
-        "pci"                  => usr::pci::main(&args),
-        "2048"                 => usr::pow::main(&args),
-        "time"                 => usr::time::main(&args),
-        "proc"                 => proc(&args),
-        _                      => {
+        ""         => ExitCode::CommandSuccessful,
+        "2048"     => usr::pow::main(&args),
+        "alias"    => cmd_alias(&args, config),
+        "base64"   => usr::base64::main(&args),
+        "beep"     => usr::beep::main(&args),
+        "calc"     => usr::calc::main(&args),
+        "chess"    => usr::chess::main(&args),
+        "colors"   => usr::colors::main(&args),
+        "copy"     => usr::copy::main(&args),
+        "date"     => usr::date::main(&args),
+        "delete"   => usr::delete::main(&args),
+        "dhcp"     => usr::dhcp::main(&args),
+        "disk"     => usr::disk::main(&args),
+        "edit"     => usr::editor::main(&args),
+        "elf"      => usr::elf::main(&args),
+        "env"      => usr::env::main(&args),
+        "find"     => usr::find::main(&args),
+        "geotime"  => usr::geotime::main(&args),
+        "goto"     => cmd_change_dir(&args, config),
+        "help"     => usr::help::main(&args),
+        "hex"      => usr::hex::main(&args),
+        "host"     => usr::host::main(&args),
+        "http"     => usr::http::main(&args),
+        "httpd"    => usr::httpd::main(&args),
+        "install"  => usr::install::main(&args),
+        "keyboard" => usr::keyboard::main(&args),
+        "lisp"     => usr::lisp::main(&args),
+        "list"     => usr::list::main(&args),
+        "memory"   => usr::memory::main(&args),
+        "move"     => usr::r#move::main(&args),
+        "net"      => usr::net::main(&args),
+        "pci"      => usr::pci::main(&args),
+        "proc"     => cmd_proc(&args),
+        "quit"     => ExitCode::ShellExit,
+        "read"     => usr::read::main(&args),
+        "set"      => cmd_set(&args, config),
+        "shell"    => usr::shell::main(&args),
+        "socket"   => usr::socket::main(&args),
+        "tcp"      => usr::tcp::main(&args),
+        "time"     => usr::time::main(&args),
+        "unset"    => cmd_unset(&args, config),
+        "user"     => usr::user::main(&args),
+        "vga"      => usr::vga::main(&args),
+        "write"    => usr::write::main(&args),
+        _          => {
             let mut path = fs::realpath(args[0]);
             if path.len() > 1 {
                 path = path.trim_end_matches('/').into();
@@ -389,7 +477,7 @@ pub fn exec(cmd: &str, env: &mut BTreeMap<String, String>) -> ExitCode {
             match syscall::info(&path).map(|info| info.kind()) {
                 Some(FileType::Dir) => {
                     sys::process::set_dir(&path);
-                    env.insert("DIR".to_string(), sys::process::dir());
+                    config.env.insert("DIR".to_string(), sys::process::dir());
                     ExitCode::CommandSuccessful
                 }
                 Some(FileType::File) => {
@@ -402,12 +490,7 @@ pub fn exec(cmd: &str, env: &mut BTreeMap<String, String>) -> ExitCode {
                     }
                 }
                 _ => {
-                    // TODO: add aliases command instead of hardcoding them
-                    let name = match args[0] {
-                        "p" => "print",
-                        arg => arg,
-                    };
-                    if api::process::spawn(&format!("/bin/{}", name), &args).is_ok() {
+                    if api::process::spawn(&format!("/bin/{}", args[0]), &args).is_ok() {
                         ExitCode::CommandSuccessful
                     } else {
                         error!("Could not execute '{}'", cmd);
@@ -428,7 +511,7 @@ pub fn exec(cmd: &str, env: &mut BTreeMap<String, String>) -> ExitCode {
     res
 }
 
-fn repl(env: &mut BTreeMap<String, String>) -> usr::shell::ExitCode {
+fn repl(config: &mut Config) -> usr::shell::ExitCode {
     println!();
 
     let mut prompt = Prompt::new();
@@ -438,7 +521,7 @@ fn repl(env: &mut BTreeMap<String, String>) -> usr::shell::ExitCode {
 
     let mut success = true;
     while let Some(cmd) = prompt.input(&prompt_string(success)) {
-        match exec(&cmd, env) {
+        match exec_with_config(&cmd, config) {
             ExitCode::CommandSuccessful => {
                 success = true;
             },
@@ -458,26 +541,37 @@ fn repl(env: &mut BTreeMap<String, String>) -> usr::shell::ExitCode {
     ExitCode::CommandSuccessful
 }
 
+pub fn exec(cmd: &str) -> ExitCode {
+    let mut config = Config::new();
+    exec_with_config(cmd, &mut config)
+}
+
 pub fn main(args: &[&str]) -> ExitCode {
-    let mut env = default_env();
+    let mut config = Config::new();
+
+    if let Ok(rc) = fs::read_to_string("/ini/shell.sh") {
+        for cmd in rc.split("\n") {
+            exec_with_config(&cmd, &mut config);
+        }
+    }
 
     if args.len() < 2 {
-        env.insert(0.to_string(), args[0].to_string());
+        config.env.insert(0.to_string(), args[0].to_string());
 
-        repl(&mut env)
+        repl(&mut config)
     } else {
-        env.insert(0.to_string(), args[1].to_string());
+        config.env.insert(0.to_string(), args[1].to_string());
 
         // Add script arguments to the environment as `$1`, `$2`, `$3`, ...
         for (i, arg) in args[2..].iter().enumerate() {
-            env.insert((i + 1).to_string(), arg.to_string());
+            config.env.insert((i + 1).to_string(), arg.to_string());
         }
 
         let pathname = args[1];
         if let Ok(contents) = api::fs::read_to_string(pathname) {
             for line in contents.split('\n') {
                 if !line.is_empty() {
-                    exec(line, &mut env);
+                    exec_with_config(line, &mut config);
                 }
             }
             ExitCode::CommandSuccessful
@@ -496,26 +590,25 @@ fn test_shell() {
     sys::fs::format_mem();
     usr::install::copy_files(false);
 
-    let mut env = default_env();
-
     // Redirect standard output
-    exec("print test1 => /test", &mut env);
+    exec("print test1 => /test");
     assert_eq!(api::fs::read_to_string("/test"), Ok("test1\n".to_string()));
 
     // Overwrite content of existing file
-    exec("print test2 => /test", &mut env);
+    exec("print test2 => /test");
     assert_eq!(api::fs::read_to_string("/test"), Ok("test2\n".to_string()));
 
     // Redirect standard output explicitely
-    exec("print test3 1=> /test", &mut env);
+    exec("print test3 1=> /test");
     assert_eq!(api::fs::read_to_string("/test"), Ok("test3\n".to_string()));
 
     // Redirect standard error explicitely
-    exec("hex /nope 2=> /test", &mut env);
+    exec("hex /nope 2=> /test");
     assert!(api::fs::read_to_string("/test").unwrap().contains("File not found '/nope'"));
 
-    exec("b = 42", &mut env);
-    exec("print a $b $c d => /test", &mut env);
+    let mut config = Config::new();
+    exec_with_config("b = 42", &mut config);
+    exec_with_config("print a $b $c d => /test", &mut config);
     assert_eq!(api::fs::read_to_string("/test"), Ok("a 42 d\n".to_string()));
 
     sys::fs::dismount();
diff --git a/src/usr/time.rs b/src/usr/time.rs
index 8d57b740..d014d0b1 100644
--- a/src/usr/time.rs
+++ b/src/usr/time.rs
@@ -6,9 +6,8 @@ pub fn main(args: &[&str]) -> usr::shell::ExitCode {
     let csi_color = Style::color("LightBlue");
     let csi_reset = Style::reset();
     let cmd = args[1..].join(" ");
-    let mut env = usr::shell::default_env();
     let start = clock::realtime();
-    usr::shell::exec(&cmd, &mut env);
+    usr::shell::exec(&cmd);
     let duration = clock::realtime() - start;
     println!("{}Executed '{}' in {:.6}s{}", csi_color, cmd, duration, csi_reset);
     usr::shell::ExitCode::CommandSuccessful

From 5c7b5821f3457501648cbc28be4793a658d096af Mon Sep 17 00:00:00 2001
From: Vincent Ollivier <v@vinc.cc>
Date: Mon, 20 Jun 2022 20:00:15 +0200
Subject: [PATCH 02/12] Fix env output error

---
 src/usr/env.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/usr/env.rs b/src/usr/env.rs
index b4421a4d..29144a10 100644
--- a/src/usr/env.rs
+++ b/src/usr/env.rs
@@ -13,7 +13,7 @@ pub fn main(args: &[&str]) -> usr::shell::ExitCode {
                 sys::process::set_env(key, val);
                 println!("{}={}", key, val);
             } else {
-                error!("Error: could not parse '{}'", arg);
+                error!("Could not parse '{}'", arg);
                 return usr::shell::ExitCode::CommandError;
             }
         }

From e7386b88c4701429c4ab270245abdddd1d356868 Mon Sep 17 00:00:00 2001
From: Vincent Ollivier <v@vinc.cc>
Date: Mon, 20 Jun 2022 20:00:34 +0200
Subject: [PATCH 03/12] Fix sort

---
 src/usr/shell.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/usr/shell.rs b/src/usr/shell.rs
index 4b3d42f0..eb2b176c 100644
--- a/src/usr/shell.rs
+++ b/src/usr/shell.rs
@@ -80,7 +80,6 @@ fn autocomplete_commands() -> Vec<String> {
             res.push(file.name());
         }
     }
-    res.sort();
     res
 }
 
@@ -111,6 +110,7 @@ fn shell_completer(line: &str) -> Vec<String> {
             }
         }
     }
+    entries.sort();
     entries
 }
 

From 6963c26a50e6441599686b7b5242b79ae485a33f Mon Sep 17 00:00:00 2001
From: Vincent Ollivier <v@vinc.cc>
Date: Mon, 20 Jun 2022 20:01:21 +0200
Subject: [PATCH 04/12] Read aliases from config file

---
 dsk/ini/shell.sh   | 24 ++++++++++++++++++++++++
 src/usr/install.rs |  5 +++--
 src/usr/shell.rs   |  3 +++
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 dsk/ini/shell.sh

diff --git a/dsk/ini/shell.sh b/dsk/ini/shell.sh
new file mode 100644
index 00000000..587048d3
--- /dev/null
+++ b/dsk/ini/shell.sh
@@ -0,0 +1,24 @@
+alias p=print
+alias c=copy
+alias d=delete
+alias del=delete
+alias e=edit
+alias f=find
+alias g=goto
+alias go=goto
+alias h=help
+alias l=list
+alias m=move
+alias q=quit
+alias exit=quit
+alias r=read
+alias w=write
+alias sh=shell
+alias dsk=disk
+alias mem=memory
+alias kbd=keyboard
+# alias cd=goto
+# alias rm=delete
+# alias ls=list
+# alias cp=copy
+# alias mv=move
diff --git a/src/usr/install.rs b/src/usr/install.rs
index 114e7073..2504296d 100644
--- a/src/usr/install.rs
+++ b/src/usr/install.rs
@@ -32,10 +32,11 @@ pub fn copy_files(verbose: bool) {
     create_dev("/dev/random", DeviceType::Random, verbose);
     create_dev("/dev/console", DeviceType::Console, verbose);
 
-    copy_file("/ini/boot.sh", include_bytes!("../../dsk/ini/boot.sh"), verbose);
     copy_file("/ini/banner.txt", include_bytes!("../../dsk/ini/banner.txt"), verbose);
-    copy_file("/ini/version.txt", include_bytes!("../../dsk/ini/version.txt"), verbose);
+    copy_file("/ini/boot.sh", include_bytes!("../../dsk/ini/boot.sh"), verbose);
     copy_file("/ini/palette.csv", include_bytes!("../../dsk/ini/palette.csv"), verbose);
+    copy_file("/ini/shell.sh", include_bytes!("../../dsk/ini/shell.sh"), verbose);
+    copy_file("/ini/version.txt", include_bytes!("../../dsk/ini/version.txt"), verbose);
 
     create_dir("/ini/lisp", verbose);
     copy_file("/ini/lisp/core.lsp", include_bytes!("../../dsk/ini/lisp/core.lsp"), verbose);
diff --git a/src/usr/shell.rs b/src/usr/shell.rs
index eb2b176c..a41a7560 100644
--- a/src/usr/shell.rs
+++ b/src/usr/shell.rs
@@ -35,11 +35,13 @@ struct Config {
 
 impl Config {
     fn new() -> Config {
+        let aliases = BTreeMap::new();
         let mut env = BTreeMap::new();
         for (key, val) in sys::process::envs() {
             env.insert(key, val); // Copy the process environment to the shell environment
         }
         env.insert("DIR".to_string(), sys::process::dir());
+        /*
         let mut aliases = BTreeMap::new();
         aliases.insert("p".to_string(),    "print".to_string());
         aliases.insert("c".to_string(),    "copy".to_string());
@@ -65,6 +67,7 @@ impl Config {
         //aliases.insert("ls".to_string(),   "list".to_string());
         //aliases.insert("cp".to_string(),   "copy".to_string());
         //aliases.insert("mv".to_string(),   "move".to_string());
+        */
 
         Config { env, aliases }
     }

From 0c9e10dc281694a03f863e119389f888c95c2b6a Mon Sep 17 00:00:00 2001
From: Vincent Ollivier <v@vinc.cc>
Date: Mon, 20 Jun 2022 20:43:06 +0200
Subject: [PATCH 05/12] Simplify arguments parsing

---
 doc/shell.md     |  23 ++++++---
 dsk/ini/shell.sh |  52 ++++++++++----------
 src/usr/env.rs   |  34 +++++++++-----
 src/usr/shell.rs | 120 ++++++++++++++++-------------------------------
 4 files changed, 107 insertions(+), 122 deletions(-)

diff --git a/doc/shell.md b/doc/shell.md
index f6ea1067..bb689a6c 100644
--- a/doc/shell.md
+++ b/doc/shell.md
@@ -1,15 +1,20 @@
 # MOROS Shell
 
+## Config
+
+The shell will read `/ini/shell.sh` during initialization to setup its
+configuration.
+
 ## Commands
 
 The main commands have a long name, a one-letter alias, and may have
 additional common aliases.
 
-<!--
 **Alias** command:
 
     > alias d delete
 
+<!--
 **Append** to file:
 
     > a a.txt
@@ -130,20 +135,26 @@ Which is more efficient than doing:
 
 Setting a variable in the shell environment is done with the following command:
 
-    > foo = "world"
+    > set foo 42
 
-And accessing that variable is done with the `$` operator:
+    > set bar "Alice and Bob"
+
+And accessing a variable is done with the `$` operator:
 
     > print $foo
-    world
+    42
 
-    > print "hello $foo"
-    hello world
+    > print "Hello $bar"
+    Hello Alice and Bob
 
 The process environment is copied to the shell environment when a session is
 started. By convention a process env var should be in uppercase and a shell
 env var should be lowercase.
 
+Unsetting a variable is done like this:
+
+    > unset foo
+
 ## Globbing
 
 MOROS Shell support filename expansion or globbing for `*` and `?` wildcard
diff --git a/dsk/ini/shell.sh b/dsk/ini/shell.sh
index 587048d3..c581669e 100644
--- a/dsk/ini/shell.sh
+++ b/dsk/ini/shell.sh
@@ -1,24 +1,28 @@
-alias p=print
-alias c=copy
-alias d=delete
-alias del=delete
-alias e=edit
-alias f=find
-alias g=goto
-alias go=goto
-alias h=help
-alias l=list
-alias m=move
-alias q=quit
-alias exit=quit
-alias r=read
-alias w=write
-alias sh=shell
-alias dsk=disk
-alias mem=memory
-alias kbd=keyboard
-# alias cd=goto
-# alias rm=delete
-# alias ls=list
-# alias cp=copy
-# alias mv=move
+# Command shortcuts
+alias p    print
+alias c    copy
+alias d    delete
+alias del  delete
+alias e    edit
+alias f    find
+alias g    goto
+alias go   goto
+alias h    help
+alias l    list
+alias m    move
+alias q    quit
+alias exit quit
+alias r    read
+alias w    write
+alias sh   shell
+alias dsk  disk
+alias mem  memory
+alias kbd  keyboard
+
+# Unix compatibility
+# alias cd   goto
+# alias cp   copy
+# alias echo print
+# alias ls   list
+# alias mv   move
+# alias rm   delete
diff --git a/src/usr/env.rs b/src/usr/env.rs
index 29144a10..b6095dca 100644
--- a/src/usr/env.rs
+++ b/src/usr/env.rs
@@ -1,22 +1,30 @@
 use crate::{sys, usr};
 
 pub fn main(args: &[&str]) -> usr::shell::ExitCode {
-    if args.len() == 1 {
-        for (key, val) in sys::process::envs() {
-            println!("{}={}", key, val);
+    match args.len() {
+        1 => {
+            for (key, val) in sys::process::envs() {
+                println!("{:10} \"{}\"", key, val);
+            }
+            usr::shell::ExitCode::CommandSuccessful
         }
-    } else {
-        for arg in args[1..].iter() {
-            if let Some(i) = arg.find('=') {
-                let (key, mut val) = arg.split_at(i);
-                val = &val[1..];
-                sys::process::set_env(key, val);
-                println!("{}={}", key, val);
+        2 => {
+            let key = args[1];
+            if let Some(val) = sys::process::env(key) {
+                println!("{}", val);
+                usr::shell::ExitCode::CommandSuccessful
             } else {
-                error!("Could not parse '{}'", arg);
-                return usr::shell::ExitCode::CommandError;
+                error!("Could not get '{}'", key);
+                usr::shell::ExitCode::CommandError
             }
         }
+        3 => {
+            sys::process::set_env(args[1], args[2]);
+            usr::shell::ExitCode::CommandSuccessful
+        }
+        _ => {
+            error!("Invalid number of arguments");
+            usr::shell::ExitCode::CommandError
+        }
     }
-    usr::shell::ExitCode::CommandSuccessful
 }
diff --git a/src/usr/shell.rs b/src/usr/shell.rs
index a41a7560..248f2631 100644
--- a/src/usr/shell.rs
+++ b/src/usr/shell.rs
@@ -41,34 +41,6 @@ impl Config {
             env.insert(key, val); // Copy the process environment to the shell environment
         }
         env.insert("DIR".to_string(), sys::process::dir());
-        /*
-        let mut aliases = BTreeMap::new();
-        aliases.insert("p".to_string(),    "print".to_string());
-        aliases.insert("c".to_string(),    "copy".to_string());
-        aliases.insert("d".to_string(),    "delete".to_string());
-        aliases.insert("del".to_string(),  "delete".to_string());
-        aliases.insert("e".to_string(),    "edit".to_string());
-        aliases.insert("f".to_string(),    "find".to_string());
-        aliases.insert("g".to_string(),    "goto".to_string());
-        aliases.insert("go".to_string(),   "goto".to_string());
-        aliases.insert("h".to_string(),    "help".to_string());
-        aliases.insert("l".to_string(),    "list".to_string());
-        aliases.insert("m".to_string(),    "move".to_string());
-        aliases.insert("q".to_string(),    "quit".to_string());
-        aliases.insert("exit".to_string(), "quit".to_string());
-        aliases.insert("r".to_string(),    "read".to_string());
-        aliases.insert("w".to_string(),    "write".to_string());
-        aliases.insert("sh".to_string(),   "shell".to_string());
-        aliases.insert("dsk".to_string(),  "disk".to_string());
-        aliases.insert("mem".to_string(),  "memory".to_string());
-        aliases.insert("kbd".to_string(),  "keyboard".to_string());
-        //aliases.insert("cd".to_string(),   "goto".to_string());
-        //aliases.insert("rm".to_string(),   "delete".to_string());
-        //aliases.insert("ls".to_string(),   "list".to_string());
-        //aliases.insert("cp".to_string(),   "copy".to_string());
-        //aliases.insert("mv".to_string(),   "move".to_string());
-        */
-
         Config { env, aliases }
     }
 }
@@ -281,64 +253,61 @@ fn cmd_change_dir(args: &[&str], config: &mut Config) -> ExitCode {
 }
 
 fn cmd_alias(args: &[&str], config: &mut Config) -> ExitCode {
-    let csi_option = Style::color("LightCyan");
-    let csi_title = Style::color("Yellow");
-    let csi_reset = Style::reset();
-    if args.len() == 1 {
-        println!("{}Usage:{} alias {}<key>=<val>{1}", csi_title, csi_reset, csi_option);
+    if args.len() != 3 {
+        let csi_option = Style::color("LightCyan");
+        let csi_title = Style::color("Yellow");
+        let csi_reset = Style::reset();
+        println!("{}Usage:{} alias {}<key> <val>{1}", csi_title, csi_reset, csi_option);
+        return usr::shell::ExitCode::CommandError;
+    }
+    config.aliases.insert(args[1].to_string(), args[2].to_string());
+    ExitCode::CommandSuccessful
+}
+
+fn cmd_unalias(args: &[&str], config: &mut Config) -> ExitCode {
+    if args.len() != 2 {
+        let csi_option = Style::color("LightCyan");
+        let csi_title = Style::color("Yellow");
+        let csi_reset = Style::reset();
+        println!("{}Usage:{} unalias {}<key>{1}", csi_title, csi_reset, csi_option);
+        return usr::shell::ExitCode::CommandError;
+    }
+
+    if config.aliases.remove(&args[1].to_string()).is_none() {
+        error!("Error: could not unalias '{}'", args[1]);
         return usr::shell::ExitCode::CommandError;
-    } else {
-        for arg in args[1..].iter() {
-            if let Some(i) = arg.find('=') {
-                let (key, mut val) = arg.split_at(i);
-                val = &val[1..];
-                config.aliases.insert(key.to_string(), val.to_string());
-            } else {
-                error!("Error: could not parse '{}'", arg);
-                return usr::shell::ExitCode::CommandError;
-            }
-        }
     }
+
     ExitCode::CommandSuccessful
 }
 
 fn cmd_set(args: &[&str], config: &mut Config) -> ExitCode {
-    let csi_option = Style::color("LightCyan");
-    let csi_title = Style::color("Yellow");
-    let csi_reset = Style::reset();
-    if args.len() == 1 {
-        println!("{}Usage:{} set {}<key>=<val>{1}", csi_title, csi_reset, csi_option);
+    if args.len() != 3 {
+        let csi_option = Style::color("LightCyan");
+        let csi_title = Style::color("Yellow");
+        let csi_reset = Style::reset();
+        println!("{}Usage:{} set {}<key> <val>{1}", csi_title, csi_reset, csi_option);
         return usr::shell::ExitCode::CommandError;
-    } else {
-        for arg in args[1..].iter() {
-            if let Some(i) = arg.find('=') {
-                let (key, mut val) = arg.split_at(i);
-                val = &val[1..];
-                config.env.insert(key.to_string(), val.to_string());
-            } else {
-                error!("Error: could not parse '{}'", arg);
-                return usr::shell::ExitCode::CommandError;
-            }
-        }
     }
+
+    config.env.insert(args[1].to_string(), args[2].to_string());
     ExitCode::CommandSuccessful
 }
 
 fn cmd_unset(args: &[&str], config: &mut Config) -> ExitCode {
-    let csi_option = Style::color("LightCyan");
-    let csi_title = Style::color("Yellow");
-    let csi_reset = Style::reset();
-    if args.len() == 1 {
+    if args.len() != 2 {
+        let csi_option = Style::color("LightCyan");
+        let csi_title = Style::color("Yellow");
+        let csi_reset = Style::reset();
         println!("{}Usage:{} unset {}<key>{1}", csi_title, csi_reset, csi_option);
         return usr::shell::ExitCode::CommandError;
-    } else {
-        for arg in args[1..].iter() {
-            if config.env.remove(&arg.to_string()).is_none() {
-                error!("Error: could not unset '{}'", arg);
-                return usr::shell::ExitCode::CommandError;
-            }
-        }
     }
+
+    if config.env.remove(&args[1].to_string()).is_none() {
+        error!("Error: could not unset '{}'", args[1]);
+        return usr::shell::ExitCode::CommandError;
+    }
+
     ExitCode::CommandSuccessful
 }
 
@@ -353,14 +322,6 @@ fn exec_with_config(cmd: &str, config: &mut Config) -> ExitCode {
         cmd = cmd.replace(&format!("${}", key), &val);
     }
 
-    // Set env var like `foo=42` or `bar = "Hello, World!"
-    if Regex::new("^\\w+ *= *\\S").is_match(&cmd) {
-        let i = cmd.find('=').unwrap();
-        let (key, mut val) = cmd.split_at(i);
-        val = &val[1..];
-        cmd = format!("set \"{}={}\"", key.trim(), val.trim().trim_matches('"'));
-    }
-
     let mut args = split_args(&cmd);
 
     // Replace command alias
@@ -468,6 +429,7 @@ fn exec_with_config(cmd: &str, config: &mut Config) -> ExitCode {
         "socket"   => usr::socket::main(&args),
         "tcp"      => usr::tcp::main(&args),
         "time"     => usr::time::main(&args),
+        "unalias"  => cmd_unalias(&args, config),
         "unset"    => cmd_unset(&args, config),
         "user"     => usr::user::main(&args),
         "vga"      => usr::vga::main(&args),

From c9a23967e64300ba744961f0b5eaa9ff33c176de Mon Sep 17 00:00:00 2001
From: Vincent Ollivier <v@vinc.cc>
Date: Tue, 21 Jun 2022 01:07:13 +0200
Subject: [PATCH 06/12] Fix test

---
 src/usr/shell.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/usr/shell.rs b/src/usr/shell.rs
index 248f2631..ac6927b5 100644
--- a/src/usr/shell.rs
+++ b/src/usr/shell.rs
@@ -572,7 +572,7 @@ fn test_shell() {
     assert!(api::fs::read_to_string("/test").unwrap().contains("File not found '/nope'"));
 
     let mut config = Config::new();
-    exec_with_config("b = 42", &mut config);
+    exec_with_config("set b 42", &mut config);
     exec_with_config("print a $b $c d => /test", &mut config);
     assert_eq!(api::fs::read_to_string("/test"), Ok("a 42 d\n".to_string()));
 

From 4c91bea196c1c9a5e8ca5face748d920521f3b24 Mon Sep 17 00:00:00 2001
From: Vincent Ollivier <v@vinc.cc>
Date: Fri, 24 Jun 2022 19:05:38 +0200
Subject: [PATCH 07/12] Clone params to spawn syscall

---
 src/usr/shell.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/usr/shell.rs b/src/usr/shell.rs
index ac6927b5..7d1bf385 100644
--- a/src/usr/shell.rs
+++ b/src/usr/shell.rs
@@ -446,7 +446,7 @@ fn exec_with_config(cmd: &str, config: &mut Config) -> ExitCode {
                     ExitCode::CommandSuccessful
                 }
                 Some(FileType::File) => {
-                    if api::process::spawn(&path, &args[1..]).is_ok() {
+                    if api::process::spawn(&path.clone(), &args.clone()).is_ok() {
                         // TODO: get exit code
                         ExitCode::CommandSuccessful
                     } else {
@@ -455,7 +455,8 @@ fn exec_with_config(cmd: &str, config: &mut Config) -> ExitCode {
                     }
                 }
                 _ => {
-                    if api::process::spawn(&format!("/bin/{}", args[0]), &args).is_ok() {
+                    path = format!("/bin/{}", args[0]);
+                    if api::process::spawn(&path.clone(), &args.clone()).is_ok() {
                         ExitCode::CommandSuccessful
                     } else {
                         error!("Could not execute '{}'", cmd);

From 1180198837a2d416a5a665a574be51a3ea627307 Mon Sep 17 00:00:00 2001
From: Vincent Ollivier <v@vinc.cc>
Date: Sat, 25 Jun 2022 12:26:23 +0200
Subject: [PATCH 08/12] Run clippy

---
 src/usr/shell.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/usr/shell.rs b/src/usr/shell.rs
index 7d1bf385..a472f4e5 100644
--- a/src/usr/shell.rs
+++ b/src/usr/shell.rs
@@ -20,7 +20,7 @@ const AUTOCOMPLETE_COMMANDS: [&str; 35] = [
 ];
 
 #[repr(u8)]
-#[derive(PartialEq)]
+#[derive(PartialEq, Eq)]
 pub enum ExitCode {
     CommandSuccessful = 0,
     CommandUnknown    = 1,
@@ -128,10 +128,10 @@ fn glob_to_regex(pattern: &str) -> String {
 fn glob(arg: &str) -> Vec<String> {
     let mut matches = Vec::new();
     if is_globbing(arg) {
-        let (dir, pattern) = if arg.contains("/") {
-            (fs::dirname(&arg).to_string(), fs::filename(&arg).to_string())
+        let (dir, pattern) = if arg.contains('/') {
+            (fs::dirname(arg).to_string(), fs::filename(arg).to_string())
         } else {
-            (sys::process::dir().clone(), arg.to_string())
+            (sys::process::dir(), arg.to_string())
         };
 
         let re = Regex::new(&glob_to_regex(&pattern));
@@ -319,7 +319,7 @@ fn exec_with_config(cmd: &str, config: &mut Config) -> ExitCode {
     while let Some((a, b)) = re.find(&cmd) {
         let key: String = cmd.chars().skip(a + 1).take(b - a - 1).collect();
         let val = config.env.get(&key).map_or("", String::as_str);
-        cmd = cmd.replace(&format!("${}", key), &val);
+        cmd = cmd.replace(&format!("${}", key), val);
     }
 
     let mut args = split_args(&cmd);
@@ -516,8 +516,8 @@ pub fn main(args: &[&str]) -> ExitCode {
     let mut config = Config::new();
 
     if let Ok(rc) = fs::read_to_string("/ini/shell.sh") {
-        for cmd in rc.split("\n") {
-            exec_with_config(&cmd, &mut config);
+        for cmd in rc.split('\n') {
+            exec_with_config(cmd, &mut config);
         }
     }
 

From 0e5fb420ae4e3398452e57a2d946c2bcb682f131 Mon Sep 17 00:00:00 2001
From: Vincent Ollivier <v@vinc.cc>
Date: Sat, 25 Jun 2022 22:31:50 +0200
Subject: [PATCH 09/12] Revert "Clone params to spawn syscall"

This reverts commit 4c91bea196c1c9a5e8ca5face748d920521f3b24.
---
 src/usr/shell.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/usr/shell.rs b/src/usr/shell.rs
index a472f4e5..f3caca90 100644
--- a/src/usr/shell.rs
+++ b/src/usr/shell.rs
@@ -446,7 +446,7 @@ fn exec_with_config(cmd: &str, config: &mut Config) -> ExitCode {
                     ExitCode::CommandSuccessful
                 }
                 Some(FileType::File) => {
-                    if api::process::spawn(&path.clone(), &args.clone()).is_ok() {
+                    if api::process::spawn(&path, &args[1..]).is_ok() {
                         // TODO: get exit code
                         ExitCode::CommandSuccessful
                     } else {
@@ -455,8 +455,7 @@ fn exec_with_config(cmd: &str, config: &mut Config) -> ExitCode {
                     }
                 }
                 _ => {
-                    path = format!("/bin/{}", args[0]);
-                    if api::process::spawn(&path.clone(), &args.clone()).is_ok() {
+                    if api::process::spawn(&format!("/bin/{}", args[0]), &args).is_ok() {
                         ExitCode::CommandSuccessful
                     } else {
                         error!("Could not execute '{}'", cmd);

From c60c4ee2f9c23e390963a676e554d5f55b3253e1 Mon Sep 17 00:00:00 2001
From: Vincent Ollivier <v@vinc.cc>
Date: Sat, 25 Jun 2022 22:55:51 +0200
Subject: [PATCH 10/12] Disable binary stripping

---
 Makefile       |   2 +-
 dsk/bin/clear  | Bin 1000 -> 11176 bytes
 dsk/bin/halt   | Bin 1168 -> 11416 bytes
 dsk/bin/hello  | Bin 1016 -> 11192 bytes
 dsk/bin/print  | Bin 1112 -> 11288 bytes
 dsk/bin/reboot | Bin 1168 -> 11424 bytes
 dsk/bin/sleep  | Bin 24608 -> 39432 bytes
 7 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 068c057f..e3643eb5 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ user-rust:
 			-C relocation-model=static
 	basename -s .rs src/bin/*.rs | xargs -I {} \
 		cp target/x86_64-moros/release/{} dsk/bin/{}
-	strip dsk/bin/*
+	#strip dsk/bin/*
 
 bin = target/x86_64-moros/release/bootimage-moros.bin
 img = disk.img
diff --git a/dsk/bin/clear b/dsk/bin/clear
index ff53afd2f63c3f881c87a2417111d14ea3ee01cc..80664c3c1fe4e52f097ec0f1bdd6b0d6d59e247d 100644
GIT binary patch
literal 11176
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

delta 112
zcmZ1x{(^mihPVb30~|OoSTL|MI54m?ux+$o!^mU6z@S&0QCw0~l9)6}%wTenrrBf%
zMs7y#$tyMO8HFdm1d@uAHMQ&+wI^o+NyEu2wd^N9&|+a^o@~e{%=wlPVzkxdlbZ4X
DVQv}d

diff --git a/dsk/bin/halt b/dsk/bin/halt
index 65e3a9075c3ce62726c66a4c28e641535cf2f822..8abda298271d8b12d452435dce0fdffe7c9d6f60 100644
GIT binary patch
literal 11416
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
bg0{`esoJmjcKX1TU#<q0(%8Hmm|y-s;g@4g

delta 117
zcmbOcIe~M6hWG_01~_nFuwY<iaA06(VB2UP$i!p7z@S&0QCw0~l9)94fSAGLBrUVa
z4vc(^+>>W&*)s}Hz6m51CrfJEGipzc1d@i6XKLF|zM##*$UNDQQJ8ZQ)NrfG3z>u`
IpV8t00Pl|*4FCWD

diff --git a/dsk/bin/hello b/dsk/bin/hello
index 0e17de49e93467304079151dd6a1f73e1a3b5cf8..60827a88f4c1699a5a3ef6b8fc4bc25a5b6291a6 100755
GIT binary patch
literal 11192
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
EZ-XEo?*IS*

delta 113
zcmdlH{)2sjhPVY20~|OoSTL|MI54m?ux+&8!^mU6z@S&0QCw0~l9)7EK+Irrlcw2Z
z2S#p2?#Vkf?HPq9{{)hXlP$IE8MP-@0!hQkJGJa5f6!uKWS(ruD9rhn5n{I0<eQrE
E0GpN?$p8QV

diff --git a/dsk/bin/print b/dsk/bin/print
index 6920fbcb77e8d6792f584493174dfaa708de5ced..3cc9af181c5290de40b5a3911d04a4ab371a0937 100644
GIT binary patch
literal 11288
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

delta 113
zcmbOcaf4%mhWHF71~_nFuwY<iaA06(VB2Uf!^C62z@S&0QCw0~l9)8PK+ItBBTci(
z4vgH4+><4>>=}h8M*>O3$uohZ_T-yD(r~h*w*BM)Z5Br6$%c%=oUu^DttMM)$pZje
CfEW@0

diff --git a/dsk/bin/reboot b/dsk/bin/reboot
index c83f324afb93e0884acf0fb5f895a61c58fcb33b..23841eb7b7b83e7f55fdaeac7f0dea85b43fa0fc 100644
GIT binary patch
literal 11424
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
VE8ar?aOGF1fu(f!yd9Wd{y#=7XM_L%

delta 111
zcmZ1wIe~M6hWG_01~_nFuwY<iaA06(VB2UP$i!p7z@S&0QCw0~l9)94fSAGLBrUti
z4vcJ!+>;k-*)s}HeyC+XIYFCavWB(=qxR%PZF@$;$qRub<77o0an4Clqpc<%)RG4P
DVK5ns

diff --git a/dsk/bin/sleep b/dsk/bin/sleep
index 9fe01fddc2b7e88b5661cdb884a51cd19c2a5695..331841144e5ddff5da8cd166abf1d0e4e3dc7e93 100644
GIT binary patch
delta 17177
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
VTeu?ql|?R=rLW14KGIw6{{Rq<I<5c!

delta 2301
zcmai04NOy46u$ShU<+bFhWu#dfpz6)Ak`Kq_|r1LTkW(WU=}rFIv1zgGPODkI+&G(
z7j2@sb3hi&%(i5@n5o?sG?5nhaSASMiY&VMvp9JOVoeq$&hd8M>#M>f+e!M)J>U7x
zJ@=k-?|ZHLmif$w_r>Xt6BdbLk)8<MTrCeIEEi1xj~c1=FW7HQ(+6BZjUod!1{DfF
z|H^>vuVSS^Q1257Ap2+(j<x+CD^eL?%R$KThw}{)+G`BpdyT9#*h@Fz6|{nxLa*ap
z(MS=hj);toP0%Lk^y!%fQ*J)p##~SU_4B$pm|7IGL!>ZIZ`g?xY7a|Q8Z!(g+M>35
z1{6Ps1g$a}7q&WRSm>#+#1K4Hk*}irjd?UZZ{o~#NeB_HP^aQbbxN-=0U^EwARBki
z%3byfAbdd*U6uDHla@f+^5!#F<Eb)#kY?qUFc;KxcWz0>N0VTRQ_^aXznYkT(d?cK
zyXBj;2wCfj@o{Xe3+?X#0{^L&D$FTUHi4VChVj;^Hm+RNPes=|T52`3rGGsU1jt;o
zLl=*nFBa9_u1vDI+A-no+qogawewejK+Nr1HH71>=F85Qfe>JApJe9*!d>S(VQPrC
zwcIw^)NOXIkKeAM-<dZ?JG|gQ%|Bokot`2ltWwa{9CMcMZ$YS;t3%ER!rdUQw#b$J
z5m08bXNOM3N5jZ)?WyBW1|j-u_QEx0s1uZk)LyGB055L?8x}B-YB*0G>3++CB=6~o
z+5dhS;m+~l;3ZtES4ulwGHwvAgLgrJ2I2+`<dK+yR|X~#J+EqMZB9D%852@UrirQA
zrEUO$FOcjGE7wchutXwO<tqOqiZZ5GA}SabGQs3S{7DU6Wim4r46Qfmn5YPP#<YaN
z8XA%PT1Lf0aY6U__2Hs!AuatT=PcrWTc>IkizK>sicJMw6iyqn7kd2p>oD%~l+R03
zC>{KT7^*8zR(*03TCqnt?D@d5HiSMXO29Tcu{Z&DP<^pu*_X$_%PDol9kOVqI2jx=
z!tKyS63(fM>nPN*(A7S^`GFv4!n;O^gTD*OpJ5Jukz{+mDvrU-*FDs`(4=|TBM3I!
zQDnGncWXngc@)Hr=P73(<VDc4X7Ryiz){hJ6L-w2WErwUH)4ZmvxrWEYb5q4D%^9?
zb{5Zdvty>nd@N5P;?k@lIWCCK3Zmk~4DDQ;jJ=+r#Ul*%(R)i?V&_1Ir6@a;@_R@n
zEyo0?ox8)ELaBM_66V+!lv`@F+=s?C?|~D>hdh)^0+kL9rTRGdqhoB+6#I?Co5fza
z(%RMKxww=n=*`khX44@WS>|E}57Gl=vzexY^nBTjX@frsf}QJ?8f-YvTl=6puC^2i
z?CPSG%hQ;<k7?U-J(C(o?=6pK4#iSc=`5`~7Rm$XESDefkLi<x-w@z8#!CERiC=Ac
z%3nE_Z}4%CrCf5ONv+^aBbqb4gzF|Q{{q)=_!h0T$%5eeruwX|;T)$Kp4nSpAXpg4
zH27MTCOD~=`Up2NP<TR}(gFi=X-JtPp#~pJs5wyWBWgc%h#P4cVqAAHQI8N;2PT@+
zcXCcBYJL)=kyTUB4WS>N72uSRmfww}Nqo`4{t!v>6Lq(^(Ed(%OUsKDRewITX0#1=
zXS7{rU12Tv^ptlht5G=|i%}xpDN(X2SV>!y0UdZER3Y1wB`-oL83B(=wwHm{!|&ht
zPQap{$E(p{0NLjqs0px{<KVXdiy8+X1Z<oHs05GCF9$ptRU@=$4hx|O?UJ4deGFQB
z`*q29aHrR08*XAi<d0!h&;$*)235(p{DnsU8J7hCHaW0+Eej*KZg0K2aoy%T)^0Ck
z4aUr@Odw@$S--`(+4=e!%5N*61x70lr(As^Zly=+6XV5w!*&pKU6N<t>09-BoJ7?P
z3vfEMH6$`=db*)udb|N>VgQ^eNrHbD{Pb{xK6yT1qrH_oS&3D-T2e@b=+XM=@h{6X
daSx-Vh9))Ysijeg74$HUR#Q35PLDJu{sVr~$M66E


From 588d186850bfe60d7a8dbb4484b3085079ea8a09 Mon Sep 17 00:00:00 2001
From: Vincent Ollivier <v@vinc.cc>
Date: Sun, 26 Jun 2022 09:41:11 +0200
Subject: [PATCH 11/12] Remove exit alias

---
 dsk/ini/shell.sh | 2 +-
 src/usr/calc.rs  | 2 +-
 src/usr/chess.rs | 2 +-
 src/usr/lisp.rs  | 2 +-
 src/usr/shell.rs | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dsk/ini/shell.sh b/dsk/ini/shell.sh
index c581669e..dbe4ede3 100644
--- a/dsk/ini/shell.sh
+++ b/dsk/ini/shell.sh
@@ -11,7 +11,6 @@ alias h    help
 alias l    list
 alias m    move
 alias q    quit
-alias exit quit
 alias r    read
 alias w    write
 alias sh   shell
@@ -23,6 +22,7 @@ alias kbd  keyboard
 # alias cd   goto
 # alias cp   copy
 # alias echo print
+# alias exit quit
 # alias ls   list
 # alias mv   move
 # alias rm   delete
diff --git a/src/usr/calc.rs b/src/usr/calc.rs
index ed9e88f2..7698124b 100644
--- a/src/usr/calc.rs
+++ b/src/usr/calc.rs
@@ -118,7 +118,7 @@ fn repl() -> usr::shell::ExitCode {
     prompt.history.load(history_file);
 
     while let Some(line) = prompt.input(&prompt_string) {
-        if line == "exit" || line == "quit" {
+        if line == "quit" {
             break;
         }
         if line.is_empty() {
diff --git a/src/usr/chess.rs b/src/usr/chess.rs
index ee1ab9b7..72d643dc 100644
--- a/src/usr/chess.rs
+++ b/src/usr/chess.rs
@@ -86,7 +86,7 @@ impl Chess {
         while let Some(cmd) = prompt.input(&prompt_string) {
             let args: Vec<&str> = cmd.trim().split(' ').collect();
             match args[0] {
-                "q" | "quit" | "exit" => break,
+                "q" | "quit" => break,
                 "h" | "help" => self.cmd_help(args),
                 "i" | "init" => self.cmd_init(args),
                 "t" | "time" => self.cmd_time(args),
diff --git a/src/usr/lisp.rs b/src/usr/lisp.rs
index 80a3b2d0..be5630b4 100644
--- a/src/usr/lisp.rs
+++ b/src/usr/lisp.rs
@@ -672,7 +672,7 @@ fn repl(env: &mut Rc<RefCell<Env>>) -> usr::shell::ExitCode {
     prompt.completion.set(&lisp_completer);
 
     while let Some(line) = prompt.input(&prompt_string) {
-        if line == "(exit)" || line == "(quit)" {
+        if line == "(quit)" {
             break;
         }
         if line.is_empty() {
diff --git a/src/usr/shell.rs b/src/usr/shell.rs
index f3caca90..f0a4e527 100644
--- a/src/usr/shell.rs
+++ b/src/usr/shell.rs
@@ -14,8 +14,8 @@ use alloc::string::{String, ToString};
 // TODO: Scan /bin
 const AUTOCOMPLETE_COMMANDS: [&str; 35] = [
     "2048", "base64", "calc", "colors", "copy", "date", "delete", "dhcp", "disk", "edit",
-    "env", "exit", "geotime", "goto", "help", "hex", "host", "http", "httpd", "install",
-    "keyboard", "lisp", "list", "memory", "move", "net", "pci", "read",
+    "env", "geotime", "goto", "help", "hex", "host", "http", "httpd", "install",
+    "keyboard", "lisp", "list", "memory", "move", "net", "pci", "quit", "read",
     "shell", "socket", "tcp", "time", "user", "vga", "write"
 ];
 

From 9fed34aa1bbb0dc3c86795e92292ed338c9917e4 Mon Sep 17 00:00:00 2001
From: Vincent Ollivier <v@vinc.cc>
Date: Sun, 26 Jun 2022 09:54:41 +0200
Subject: [PATCH 12/12] Update doc

---
 doc/lisp.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/lisp.md b/doc/lisp.md
index 4cd2f8ae..4a46eaf6 100644
--- a/doc/lisp.md
+++ b/doc/lisp.md
@@ -46,7 +46,7 @@ MOROS Lisp v0.1.0
 > (+ 1 2)
 3
 
-> (exit)
+> (quit)
 ```
 
 And it can execute a file. For example a file located in `/tmp/fibonacci.lsp`