Fixes for demo

diff --git a/Makefile b/Makefile
index a882fb8554e2c111177041a5a6adc7073d5aaaae..5140c18c3b0557f0ae3f18ea5cff40cfa44a7c06 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ html: $(HTML)
 resources: $(RESOURCES)
 
 demo: html resources bbemu
-       ./setup install
+       ./setup.py install
        cp src/avr/emu/bbemu /usr/local/bin
 
 bbemu:

diff --git a/scripts/demo-chroot b/scripts/demo-chroot
index 75e757844da463246b7b7ededdb4a349db229f1c..4c8f07cecc0f9a20fd730522659325edd80de976 100755 (executable)
--- a/scripts/demo-chroot
+++ b/scripts/demo-chroot
@@ -4,7 +4,10 @@ ROOT="$PWD/demo"
 
 # Clean up on EXIT
 function cleanup {
-    umount "$ROOT"/{dev/pts,dev,sys,proc} 2>/dev/null || true
+    umount "$ROOT"/dev/pts 2>/dev/null || true
+    umount "$ROOT"/proc 2>/dev/null || true
+    umount "$ROOT"/sys 2>/dev/null || true
+    umount "$ROOT"/dev 2>/dev/null || true
 }
 trap cleanup EXIT