Easier Makefile commands

CHANGELOG.md

@@ -6,3 +6,4 @@ All notable changes to Wildflower after the MOROS fork will be documented in thi
 - Dependency Updates
 - Wildflower Branding
 - HFS (Hidden File System)
+- Easier Makefile commands

Makefile

@@ -125,3 +125,13 @@ pkg:
 clean:
 	cargo clean
 	rm -f www/*.html www/images/*.png
+
+build:
+	make image output=video keyboard=qwerty
+
+wfos:
+	make qemu output=video nic=rtl8139
+
+all:
+	make build
+	make wfos

README.md

@@ -10,8 +10,7 @@ to 2020, but it also runs well on most emulators (Bochs, QEMU, and VirtualBox).
 ## Running
 ```sh
 cargo install bootimage # If you haven't already
-make image output=video keyboard=qwerty
-make qemu output=video nic=rtl8139
+make all
 install # Do this once the emulator is running
 # Choose /dev/ata/0/0 as the disk
 ```

src/usr/shell.rs

@@ -523,7 +523,7 @@ fn dispatch(args: &[&str], config: &mut Config) -> Result<(), ExitCode> {
         "dhcp" => usr::dhcp::main(args),
         "diff" => usr::diff::main(args),
         "disk" => usr::disk::main(args),
-        "edit" => usr::edit::main(args),
+        "edit" | "nano" => usr::edit::main(args),
         "elf" => usr::elf::main(args),
         "encode" => usr::encode::main(args),
         "env" => usr::env::main(args),
@@ -548,7 +548,7 @@ fn dispatch(args: &[&str], config: &mut Config) -> Result<(), ExitCode> {
         "pci" => usr::pci::main(args),
         "pi" => usr::pi::main(args),
         "quit" => Err(ExitCode::ShellExit),
-        "read" => usr::read::main(args),
+        "read" | "cat" => usr::read::main(args),
         "render" => usr::render::main(args),
         "set" => cmd_set(args, config),
         "shell" => usr::shell::main(args),