From d8e71a6b2d0aae299ec4344a05b3dd9614b817dd Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Sat, 17 Jun 2023 06:14:35 +0200
Subject: [PATCH] minor cleanup

---
 notwa-util/cosmopolitan11 | 23 +++++++++++------------
 notwa-util/doit11         |  3 ++-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/notwa-util/cosmopolitan11 b/notwa-util/cosmopolitan11
index dda28b0..207e5c2 100755
--- a/notwa-util/cosmopolitan11
+++ b/notwa-util/cosmopolitan11
@@ -3,7 +3,6 @@ if [ ! -e /cosmopolitan.done ]; then
 : \
  && cd /root/cosmopolitan \
  && export V=0 COLUMNS=80 TMPDIR=/tmp \
- && export COSMO_FLAVOR=opt \
  && . ./env \
  && { [ "$COSMO_FLAVOR" != def ] && mode="$COSMO_FLAVOR" || mode= ;} \
  && printf '%s="%s"\n' >env \
@@ -30,17 +29,17 @@ if [ ! -e /cosmopolitan.done ]; then
  && if [ "$COSMO_FLAVOR" = dbg ] \
     ;then : \
      && ./expand ./makeit \
-  a//ape-copy-self.o a//ape-no-modify-self.o a//ape.elf \
-  a//ape.lds a//ape.macho a//ape.o \
-  a//public/ape.lds b//ar.com b//chmod.com \
-  b//cocmd.com b//compile.com b//cp.com \
-  b//echo.com b//fixupobj.com b//gzip.com \
-  b//mkdeps.com b//mkdir.com b//package.com \
-  b//pwd.com b//rm.com b//rollup.com \
-  b//symtab.com b//touch.com b//unbundle.com \
-  b//zipcopy.com b//zipobj.com o//cosmopolitan.a \
-  o//libc/crt/crt.o o/cosmopolitan.h t//make/make.com \
-  t//unzip/unzip.com t//zip/zip.com \
+  a//ape-copy-self.o        a//ape-no-modify-self.o   a//ape.elf \
+  a//ape.lds                a//ape.macho              a//ape.o \
+  a//public/ape.lds         b//ar.com                 b//chmod.com \
+  b//cocmd.com              b//compile.com            b//cp.com \
+  b//echo.com               b//fixupobj.com           b//gzip.com \
+  b//mkdeps.com             b//mkdir.com              b//package.com \
+  b//pwd.com                b//rm.com                 b//rollup.com \
+  b//symtab.com             b//touch.com              b//unbundle.com \
+  b//zipcopy.com            b//zipobj.com             o//cosmopolitan.a \
+  o//libc/crt/crt.o         o/cosmopolitan.h          t//make/make.com \
+  t//unzip/unzip.com        t//zip/zip.com \
     ;else : \
      && ./makeit all \
     ;fi \
diff --git a/notwa-util/doit11 b/notwa-util/doit11
index 22d1f27..598d655 100755
--- a/notwa-util/doit11
+++ b/notwa-util/doit11
@@ -11,7 +11,6 @@ export \
 BUSYBOX_SHA256=b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314 \
 BUSYBOX_VERSION=1.36.1 \
 COSMO_COMMIT=c3440d040c57316b91632d3c3b4fb1316b2fa87c \
-COSMO_FLAVOR=fastbuild \
 COSMO_SHA256=f388521fc4d599ca96dc1131bfb5f64af8eb0235a49884693532f9db242ba6f4 \
 ENDLESSH_COMMIT=dfe44eb2c5b6fc3c48a39ed826fe0e4459cdf6ef \
 ENDLESSH_SHA256=c8989988af0a8c848d1a4979962f008c504a12ed6fe6a12e032c37feaa0ae5f8 \
@@ -43,7 +42,9 @@ if [ ! -e /notwa-util.done ]; then
  || exit $?
 fi
 
+export COSMO_FLAVOR=fastbuild || exit $?
 . /vagrant/notwa-util/cosmopolitan-bootstrap11 || exit $?
+export COSMO_FLAVOR=opt || exit $?
 . /vagrant/notwa-util/cosmopolitan11 || exit $?
 cd /root/cosmopolitan && . ./env || exit $?
 export COSMO COSMO_DIST