simplify rescue shell

build-all

@@ -59,6 +59,7 @@ build_simple() { : \
  && build   cosmo-awk           \
  && build   cosmo-dist          \
  && build   cosmo-sed           \
+ && build   rescue              \
 `# phase 4` \
  && build   cosmo-base          \
  && build_simple                \

cosmo-bootstrap/Dockerfile

@@ -81,6 +81,8 @@ RUN --mount=type=tmpfs,target=/tmp : \
   b//mkdir.com              b//package.com            b//pwd.com                \
   b//rm.com                 b//touch.com              b//unbundle.com           \
   b//zipobj.com             \
+# install the newly-built ape loader, just in case it has changed: \
+ && ./expand install -m0755 a//ape.elf /usr/bin/ape \
 ;
 
 # optionally use the newly-built bootstrapped binaries to build themselves again.

rescue/Dockerfile

@@ -0,0 +1,4 @@
+FROM scratch
+COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
+COPY --chmod=0755 --from=localhost/cosmo-bootstrap /usr/bin/ape /bin/ape
+ENTRYPOINT ["/bin/busybox"]

simple/assimilate.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/assimilate.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/assimilate.com"]

simple/bd.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/bd.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/bd.com"]

simple/bing.Dockerfile

@@ -1,6 +1,4 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/bing.* /bin/
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/unbing.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/bing.com"]

simple/blinkenlights.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/blinkenlights.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/blinkenlights.com"]

simple/cosmo-chibicc.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/chibicc.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/chibicc.com"]

simple/cosmo-lua.Dockerfile

@@ -1,6 +1,4 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/lua.* /bin/
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/luac.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/lua.com"]

simple/cosmo-make.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/make.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/make.com"]

simple/cosmo-python.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/python.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/python.com"]

simple/cosmo-sqlite.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/sqlite3.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/sqlite3.com"]

simple/fold.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/fold.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/fold.com"]

simple/greenbean.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/greenbean.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/greenbean.com"]

simple/life.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/life.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/life.com"]

simple/memzoom.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/memzoom.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/memzoom.com"]

simple/mkdeps.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/mkdeps.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/mkdeps.com"]

simple/pledge.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/pledge.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/pledge.com"]

simple/printimage.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/printimage.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/printimage.com"]

simple/printvideo.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/printvideo.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/printvideo.com"]

simple/quickjs.Dockerfile

@@ -1,6 +1,4 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/qjs.* /bin/
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/qjsc.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/qjs.com"]

simple/redbean.Dockerfile

@@ -1,6 +1,4 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/redbean-demo.* /bin/
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/redbean-original.* /bin/
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/redbean-static.* /bin/

simple/tinyemu.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/tinyemu.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/tinyemu.com"]

simple/unbourne.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch AS runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/unbourne.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/unbourne.com"]

simple/unveil.Dockerfile

@@ -1,5 +1,3 @@
-FROM scratch as runner
-COPY --chmod=0755 --from=localhost/notwa-util /nu/busybox /bin/busybox
-COPY --chmod=0755 --from=localhost/cosmo-all /cosmopolitan/build/bootstrap/ape.elf /bin/ape
+FROM rescue
 COPY --chmod=0755 --from=localhost/cosmo-all /usr/local/bin/unveil.* /bin/
 ENTRYPOINT ["/bin/ape", "/bin/unveil.com"]