use apecopy

notwa-util/cosmo-kuroko11

@@ -20,9 +20,7 @@ int main(int argc, char * argv[]) {
  && CC=cosmocc CFLAGS="-Os -g" AR=ar.com ARFLAGS=rcsD \
     make.com kuroko modules/codecs/sbencs.krk modules/codecs/dbdata.krk \
     -j2 KRK_DISABLE_RLINE=1 KRK_DISABLE_DYNAMIC=1 \
- && cp kuroko kuroko.com.dbg \
- && x86_64-linux-musl-objcopy -S -O binary kuroko.com.dbg kuroko.com \
- && zipcopy.com kuroko.com.dbg kuroko.com \
+ && apecopy kuroko kuroko.com \
 \
  && rm test/day23.krk \
  && rm test/testAnnotations.krk \

notwa-util/cosmo-yices11

@@ -49,18 +49,16 @@ if [ ! -e /cosmo-yices.done ]; then
     LIBS="-lkissat" \
     ./configure --prefix= \
  && make -j2 static-dist \
- && mv build/x86_64-pc-linux-gnu-release/static_dist dist \
+\
+ && mkdir -p dist \
+ && cp -r build/x86_64-pc-linux-gnu-release/static_dist/bin dist \
  && cd dist/bin \
  && for bin in yices yices-sat yices-smt yices-smt2 \
     ;do : \
-     && mv "$bin" "$bin.com.dbg" \
-     && x86_64-linux-musl-objcopy -S -O binary "$bin.com.dbg" "$bin.com" \
-     && zipcopy.com "$bin.com.dbg" "$bin.com" \
+     && apecopy "$bin" "$bin.com" \
     ;done \
  && cd /root/kissat/build \
- && mv "kissat" "kissat.com.dbg" \
- && x86_64-linux-musl-objcopy -S -O binary "kissat.com.dbg" "kissat.com" \
- && zipcopy.com "kissat.com.dbg" "kissat.com" \
+ && apecopy kissat kissat.com \
 \
  && touch /cosmo-yices.done \
  || exit $?

notwa-util/cosmopolitan-install11

@@ -14,7 +14,7 @@ if [ ! -e /cosmopolitan-install.done ]; then
   o//cosmopolitan.a         o//libc/crt/crt.o         o/cosmopolitan.h          \
 \
  && install -m0755 "dist/$flavor/ape.elf" /usr/bin/ape \
- && install -m0755 -t /usr/bin bin/cosmocc bin/cosmoc++ \
+ && install -m0755 -t /usr/bin bin/apecopy bin/cosmocc bin/cosmoc++ \
  && find libc -name '*.h' >headers.txt \
  && expand tar zcf /tmp/headers.tar.gz -T headers.txt \
   libc/integral             T//gdtoa/gdtoa.h          T//getopt/long1.h         \

notwa-util/doit11

@@ -64,7 +64,7 @@ sed \
 -e "s,/opt/cosmos\\b,/opt/cosmo,g" \
 -e "s,/o//tool/build/,/bin/,g" \
 -e "s,.* must not contain hyphens .*,:," \
--i /usr/bin/cosmocc
+-i /usr/bin/apecopy /usr/bin/cosmocc /usr/bin/cosmoc++
 
 cd /root && export PATH="$COSMO/bin:$COSMO/gcc/bin:$PATH" || exit $?
 unset V COLUMNS TMPDIR