# HG changeset patch
# User Richard Westhaver <ellis@rwest.io>
# Date 1720439974 14400
# Node ID 0f7895a84fe969b5aebb9ea57c405c239073055a
# Parent  71ab9bc4ce8423aff6a34ffb8aee6effd73401cb# Parent  49aad0912d602e1ae8ea79e0e1266cab5d291f3d
merge

diff -r 71ab9bc4ce84 -r 0f7895a84fe9 scripts/build-sbcl-gencgc.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/build-sbcl-gencgc.sh	Mon Jul 08 07:59:34 2024 -0400
@@ -0,0 +1,4 @@
+#!/bin/sh
+cd .stash/src/sbcl
+echo \""2.4.6:$(git rev-parse --short HEAD)"\" > version.lisp-expr
+./make.sh --fancy
diff -r 71ab9bc4ce84 -r 0f7895a84fe9 scripts/build-sbcl.sh
--- a/scripts/build-sbcl.sh	Mon Jul 08 07:57:23 2024 -0400
+++ b/scripts/build-sbcl.sh	Mon Jul 08 07:59:34 2024 -0400
@@ -1,4 +1,4 @@
-./scripts/get-sbcl.sh
+#!/bin/sh
 cd .stash/src/sbcl
-echo \""2.4.6:$(git rev-parse --short HEAD)"\" > version.lisp-expr &&
-  ./make.sh --dynamic-space-size=8Gb --without-gencgc --with-mark-region-gc --fancy
+echo \""2.4.6:$(git rev-parse --short HEAD)"\" > version.lisp-expr
+./make.sh --dynamic-space-size=8Gb --without-gencgc --with-mark-region-gc --fancy
diff -r 71ab9bc4ce84 -r 0f7895a84fe9 scripts/dist-emacs-binary.sh
--- a/scripts/dist-emacs-binary.sh	Mon Jul 08 07:57:23 2024 -0400
+++ b/scripts/dist-emacs-binary.sh	Mon Jul 08 07:59:34 2024 -0400
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
-name="${1:-emacs}"
+name="${1:-emacs-31.0.50}"
 cd .stash/src/emacs
 ./make-dist --tar --no-compress
-zstd -22 "${name}*.tar" -o "../../${name}.tar.zst"
+zstd -22 "${name}.tar" -o "../../emacs.tar.zst"
diff -r 71ab9bc4ce84 -r 0f7895a84fe9 scripts/dist-sbcl-binary.sh
--- a/scripts/dist-sbcl-binary.sh	Mon Jul 08 07:57:23 2024 -0400
+++ b/scripts/dist-sbcl-binary.sh	Mon Jul 08 07:59:34 2024 -0400
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 # binary dist
-cd .stash/src/
+cd .stash/src/ && \
 tar -cf sbcl.tar sbcl/output/sbcl.core sbcl/src/runtime/sbcl sbcl/output/prefix.def \
     sbcl/src/runtime/sbcl.mk \
     `grep '^LIBSBCL=' sbcl/src/runtime/sbcl.mk | cut -d= -f2- | while read lib; do echo sbcl/src/runtime/$lib; done` \
@@ -16,7 +16,7 @@
              echo $src_dir/Makefile
          fi
      done` \
-    sbcl/obj/sbcl-home
-zstd sbcl.tar
-rm sbcl.tar
+    sbcl/obj/sbcl-home && \
+zstd sbcl.tar && \
+rm sbcl.tar && \
 mv sbcl.tar.zst ../
diff -r 71ab9bc4ce84 -r 0f7895a84fe9 scripts/install-sbcl-pack.sh
--- a/scripts/install-sbcl-pack.sh	Mon Jul 08 07:57:23 2024 -0400
+++ b/scripts/install-sbcl-pack.sh	Mon Jul 08 07:59:34 2024 -0400
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 TARGET="${1:-x86_64-unknown-linux-gnu}"
-cd .stash/src 
+cd .stash/tmp
 curl -O "https://packy.compiler.company/dist/${TARGET}/sbcl.tar.zst"
 unzstd sbcl.tar.zst
 tar -xvf sbcl.tar