about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2021-03-12 10:14:44 -0800
committerKartik Agaram <vc@akkartik.com>2021-03-12 10:14:59 -0800
commit7ce83f9bfff31da977366250c581f453ca52fd74 (patch)
tree540046c2361ce1cec08b887b0c6e4b8b6516b909
parent7e87c36c3aec7d715f7fbb04ca6bd6557eeedef3 (diff)
downloadmu-7ce83f9bfff31da977366250c581f453ca52fd74.tar.gz
some tweaks while updating mu-normie
-rw-r--r--README.md2
-rwxr-xr-xlinux/bootstrap/bootstrap4
-rwxr-xr-xlinux/test_apps4
-rwxr-xr-xlinux/test_apps_emulated2
4 files changed, 7 insertions, 5 deletions
diff --git a/README.md b/README.md
index 4c5dc88c..ac66abe7 100644
--- a/README.md
+++ b/README.md
@@ -170,7 +170,7 @@ More resources on SubX:
 
 Forks of Mu are encouraged. If you don't like something about this repo, feel
 free to make a fork. If you show it to me, I'll link to it here. I might even
-pull your changes into this repo!
+pull features upstream!
 
 - [mu-normie](https://git.sr.ht/~akkartik/mu-normie): with a more standard
   build system that organizes the repo by header files and compilation units.
diff --git a/linux/bootstrap/bootstrap b/linux/bootstrap/bootstrap
index b3e6cc60..c15a9dc3 100755
--- a/linux/bootstrap/bootstrap
+++ b/linux/bootstrap/bootstrap
@@ -2,4 +2,6 @@
 # Run SubX VM, first compiling if necessary.
 set -e
 
-$(dirname $0)/build  &&  $(dirname $0)/bootstrap_bin "$@"
+$(dirname $0)/build
+
+$(dirname $0)/bootstrap_bin "$@"
diff --git a/linux/test_apps b/linux/test_apps
index e72975d4..0c2a9fd8 100755
--- a/linux/test_apps
+++ b/linux/test_apps
@@ -80,12 +80,12 @@ echo ex6
 bootstrap/bootstrap translate 000init.subx ex6.subx  -o ex6
 {
   bootstrap/bootstrap run ex6 >ex6.out  ||  true
-  test "`cat ex6.out`" = 'Hello, world!'
+  test "`cat ex6.out`" = 'Hello world!'
 }
 {
   chmod +x ex6
   ./ex6 >ex6.out  ||  true
-  test "`cat ex6.out`" = 'Hello, world!'
+  test "`cat ex6.out`" = 'Hello world!'
 }
 
 echo ex7
diff --git a/linux/test_apps_emulated b/linux/test_apps_emulated
index 9a488c2f..8b612ef6 100755
--- a/linux/test_apps_emulated
+++ b/linux/test_apps_emulated
@@ -56,7 +56,7 @@ echo ex6
 bootstrap/bootstrap translate 000init.subx ex6.subx  -o ex6
 {
   bootstrap/bootstrap run ex6 >ex6.out  ||  true
-  test "`cat ex6.out`" = 'Hello, world!'
+  test "`cat ex6.out`" = 'Hello world!'
 }
 
 echo ex7