# HG changeset patch
# User Richard Westhaver <ellis@rwest.io>
# Date 1718489561 0
# Node ID c5aa261cb8365a86967c41f5880a6c9e8314bb74
# Parent  c90f38d8e60aeb7f36d72265f59232cb0a950398
bootstrap updates

diff -r c90f38d8e60a -r c5aa261cb836 bootstrap.sh
--- a/bootstrap.sh	Sat Jun 15 00:19:00 2024 +0000
+++ b/bootstrap.sh	Sat Jun 15 22:12:41 2024 +0000
@@ -11,7 +11,7 @@
       _ext=".exe"
       ;;
   esac
-  local _url="https://packy.compiler.company/dist/${_arch}"
+  local _url="https://packy.compiler.company/dist/${_arch}/pack"
   local _stash
   if ! _stash=".stash"; then
     # Because the previous command ran in a subshell, we must manually
@@ -23,31 +23,35 @@
   ensure mkdir -p "${_stash}/bin"
   ensure mkdir -p "${_stash}/lib"
   ensure mkdir -p "${_stash}/include"
-  ensure mkdir -p "${_stash}/pack"
   cd "${_stash}"
-  local _sbcl_pack="pack/sbcl.tar.zst"
-  local _rocksdb_pack="pack/rocksdb.tar.zst"
-  local _core_pack="pack/core.tar.zst"
+  local _sbcl_pack="sbcl.tar.zst"
+  local _rocksdb_pack="rocksdb.tar.zst"
+  local _core_pack="core.tar.zst"
+  local _core_src_pack="core-source.tar.zst"
   local _sbcl_url="${_url}/${_sbcl_pack}"
   local _rocksdb_url="${_url}/${_rocksdb_pack}"
   local _core_url="${_url}/${_core_pack}"
+  local _core_src_url="${_url}/${_core_pack}"
   ensure download "$_sbcl_url" "$_sbcl_pack" "$_arch"
   unzstd "${_sbcl_pack}"
-  tar -xvf "pack/sbcl.tar"
+  tar -xvf "sbcl.tar"
   cd sbcl && INSTALL_ROOT=$(realpath ..) sh install.sh && cd ..
-  ensure download "$_rocksdb_url" "${_rocksdb_pack}" "$_arch"
-  unzstd "${_rocksdb_pack}"
-  tar -xvf "pack/rocksdb.tar"
-  cp -rf rocksdb/include/* include/
-  cp -rf rocksdb/*.so lib/
-  ensure download "$_core_url" "${_core_pack}" "$_arch"
-  unzstd "${_core_pack}"
-  tar -xvf "pack/core.tar"
-  cp -rf core/bin/* bin/
-  cp -rf core/share/* share/
-  # chmod +x "bin/*"
-  rm -rf core rocksdb sbcl
-  rm -rf pack/*.tar
+  ensure download "$_core_src_url" "$_core_src_pack" "$_arch"
+  unzstd "${_core_src_pack}"
+  tar -xvf "core-source.tar"
+  # ensure download "$_rocksdb_url" "${_rocksdb_pack}" "$_arch"
+  # unzstd "${_rocksdb_pack}"
+  # tar -xvf "pack/rocksdb.tar"
+  # cp -rf rocksdb/include/* include/
+  # cp -rf rocksdb/*.so lib/
+  # ensure download "$_core_url" "${_core_pack}" "$_arch"
+  # unzstd "${_core_pack}"
+  # tar -xvf "pack/core.tar"
+  # cp -rf core/bin/* bin/
+  # cp -rf core/share/* share/
+  chmod +x bin/*
+  # rm -rf core rocksdb sbcl
+  rm -rf *.tar
 }
 
 _read() {
diff -r c90f38d8e60a -r c5aa261cb836 scripts/dist-rocksdb-binary.sh
--- a/scripts/dist-rocksdb-binary.sh	Sat Jun 15 00:19:00 2024 +0000
+++ b/scripts/dist-rocksdb-binary.sh	Sat Jun 15 22:12:41 2024 +0000
@@ -2,4 +2,4 @@
 set -e
 cd .stash/src
 tar -I 'zstd' -cf rocksdb.tar.zst rocksdb/librocksdb.so* rocksdb/include/*
-mv rocksdb.tar.zst ../dist/
+mv rocksdb.tar.zst ../
diff -r c90f38d8e60a -r c5aa261cb836 scripts/dist-rocksdb-source.sh
--- a/scripts/dist-rocksdb-source.sh	Sat Jun 15 00:19:00 2024 +0000
+++ b/scripts/dist-rocksdb-source.sh	Sat Jun 15 22:12:41 2024 +0000
@@ -4,4 +4,4 @@
 make clean
 cd ..
 tar -I 'zstd' -cf rocksdb-source.tar.zst rocksdb
-mv rocksdb-source.tar.zst ../dist/
+mv rocksdb-source.tar.zst ../
diff -r c90f38d8e60a -r c5aa261cb836 scripts/dist-sbcl-binary.sh
--- a/scripts/dist-sbcl-binary.sh	Sat Jun 15 00:19:00 2024 +0000
+++ b/scripts/dist-sbcl-binary.sh	Sat Jun 15 22:12:41 2024 +0000
@@ -17,4 +17,4 @@
          fi
      done` \
     sbcl/obj/sbcl-home
-mv sbcl.tar.zst ../dist/
+mv sbcl.tar.zst ../
diff -r c90f38d8e60a -r c5aa261cb836 scripts/dist-sbcl-source.sh
--- a/scripts/dist-sbcl-source.sh	Sat Jun 15 00:19:00 2024 +0000
+++ b/scripts/dist-sbcl-source.sh	Sat Jun 15 22:12:41 2024 +0000
@@ -4,4 +4,4 @@
 sh clean.sh
 cd ..
 tar -I 'zstd' -cf sbcl-source.tar.zst --exclude .git sbcl
-mv sbcl-source.tar.zst ../dist/
+mv sbcl-source.tar.zst ../
diff -r c90f38d8e60a -r c5aa261cb836 skelfile
--- a/skelfile	Sat Jun 15 00:19:00 2024 +0000
+++ b/skelfile	Sat Jun 15 22:12:41 2024 +0000
@@ -59,7 +59,7 @@
         #$cd .stash/src/linux && make mrproper -j &&
         zcat /proc/config.gz > .config && yes N | make localmodconfig$#)
  (xcaddy () #$go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest$#)
- (caddy-webdav (xcaddy) #$xcaddy build --output .stash/caddy --with github.com/mholt/caddy-webdav
+ (caddy-webdav (xcaddy) #$xcaddy build --output .stash/caddy --with github.com/mholt/caddy-webdav$#)
  (rust () #$scripts/get-rust.sh$#)
  (ublk () #$scripts/get-ublksrv.sh$#
        #$cd .stash/src/ublksrv && autoreconf -i && ./configure && make$#)
@@ -78,4 +78,9 @@
  (emacs-install () #$cd .stash/src/emacs && make install$#)
  (rocksdb-install () #$cd .stash/src/rocksdb && make install-shared &&
                   cp -r include/* /usr/local/include/$#)
- (stumpwm-install () #$cd .stash/src/stumpwm && make install$#))
+ (stumpwm-install () #$cd .stash/src/stumpwm && make install$#)
+ ;; dist
+ (dist (rocksdb sbcl) #$scripts/dist-rocksdb-binary.sh
+       scripts/dist-rocksdb-source.sh
+       scripts/dist-sbcl-binary.sh
+       scripts/dist-sbcl-source.sh$#))