# HG changeset patch
# User Richard Westhaver <ellis@rwest.io>
# Date 1717630454 0
# Node ID 80e639d0b2034a7b7ec4f65593021a84d1dd7570
# Parent  b02ad2a8f15a9b9d3aedddc5f600ba83349f73f5
quick fixes

diff -r b02ad2a8f15a -r 80e639d0b203 autogen.lisp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/autogen.lisp	Wed Jun 05 23:34:14 2024 +0000
@@ -0,0 +1,45 @@
+;;; bootstrap.lisp --- let 'er rip
+
+;;
+
+;;; Code:
+(in-package :std-user)
+
+(defpkg :infra/bootstrap
+  (:use :cl :skel :log :std/named-readtables
+        :dat/json :dat/sxp :net/fetch :net/util
+        :cli/progress :cli/ansi :cli/ed :cli/prompt
+        :cli/shell :std/hash-table :std/alien :std/macs
+        :std/fmt))
+(in-package :infra/bootstrap)
+(in-readtable :shell)
+
+(eval-when (:compile-toplevel)
+  (defstruct host name cpus mem arch kernel core)
+  (defparameter *profile* (read-sxp-file
+                           (if-let ((profile (sb-posix:getenv "BUILD_PROFILE")))
+                             profile
+                             #P"default.sxp")))
+  (defparameter *core* sb-ext:*core-pathname*)
+  (defparameter *host-config* (read-sxp-file
+                               (let ((hcfg (format nil "~a.sxp" (sb-unix:unix-gethostname))))
+                                 (unless (probe-file hcfg)
+                                   (print #0$./check.sh$#))
+                                 hcfg)))
+  (defparameter *env* (let ((table (make-hash-table :test 'equal))
+                            (keys (list "STASH" "STORE" "DIST" "PACKY_URL" "VC_URL" "INSTALL_PREFIX"
+                                        "CC" "AR" "HG" "GIT" "LISP" "RUST" "LD" "SHELL" "DEV" "DEV_HOME"
+                                        "DEV_ID" "WORKER" "WORKER_ID" "WORKER_HOME" "CARGO_HOME" "RUSTUP_HOME"
+                                        "LISP_HOME")))
+                  (dolist (k keys table)
+                    (setf (gethash k table) (sb-posix:getenv k))))))
+
+(println "starting bootstrap.lisp")
+;; (println sb-sys::*machine-version*)
+;; (trace! "env:" (hash-table-alist *env*))
+
+;; build-config
+(defun apply-build-config ()
+  (setf *log-level* :trace))
+
+;; host-config
diff -r b02ad2a8f15a -r 80e639d0b203 bootstrap.lisp
--- a/bootstrap.lisp	Wed Jun 05 22:37:56 2024 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-;;; bootstrap.lisp --- let 'er rip
-
-;;
-
-;;; Code:
-(in-package :std-user)
-
-(defpkg :infra/bootstrap
-  (:use :cl :skel :log :std/named-readtables
-        :dat/json :dat/sxp :net/fetch :net/util
-        :cli/progress :cli/ansi :cli/ed :cli/prompt
-        :cli/shell :std/hash-table :std/alien :std/macs
-        :std/fmt))
-(in-package :infra/bootstrap)
-(in-readtable :shell)
-
-(eval-when (:compile-toplevel)
-  (defstruct host name cpus mem arch kernel core)
-  (defparameter *profile* (read-sxp-file
-                           (if-let ((profile (sb-posix:getenv "BUILD_PROFILE")))
-                             profile
-                             #P"default.sxp")))
-  (defparameter *core* sb-ext:*core-pathname*)
-  (defparameter *host-config* (read-sxp-file
-                               (let ((hcfg (format nil "~a.sxp" (sb-unix:unix-gethostname))))
-                                 (unless (probe-file hcfg)
-                                   (print #0$./check.sh$#))
-                                 hcfg)))
-  (defparameter *env* (let ((table (make-hash-table :test 'equal))
-                            (keys (list "STASH" "STORE" "DIST" "PACKY_URL" "VC_URL" "INSTALL_PREFIX"
-                                        "CC" "AR" "HG" "GIT" "LISP" "RUST" "LD" "SHELL" "DEV" "DEV_HOME"
-                                        "DEV_ID" "WORKER" "WORKER_ID" "WORKER_HOME" "CARGO_HOME" "RUSTUP_HOME"
-                                        "LISP_HOME")))
-                  (dolist (k keys table)
-                    (setf (gethash k table) (sb-posix:getenv k))))))
-
-(println "starting bootstrap.lisp")
-;; (println sb-sys::*machine-version*)
-;; (trace! "env:" (hash-table-alist *env*))
-
-;; build-config
-(defun apply-build-config ()
-  (setf *log-level* :trace))
-
-;; host-config
diff -r b02ad2a8f15a -r 80e639d0b203 bootstrap.sh
--- a/bootstrap.sh	Wed Jun 05 22:37:56 2024 +0000
+++ b/bootstrap.sh	Wed Jun 05 23:34:14 2024 +0000
@@ -26,6 +26,7 @@
   ensure download "$_rocksdb_url" "${_stash}/src/rocksdb.tar.zst" "$_arch"
   ensure download "$_sk_url" "${_stash}/bin/sk" "$_arch"
   chmod +x "${_stash}/bin/sk"
+  say "OK ${_stash}/bin/sk"
 }
 
 _read() {
diff -r b02ad2a8f15a -r 80e639d0b203 check.sh
--- a/check.sh	Wed Jun 05 22:37:56 2024 +0000
+++ b/check.sh	Wed Jun 05 23:34:14 2024 +0000
@@ -25,7 +25,7 @@
   get_architecture || return 1
   local _arch="$RETVAL"
   assert_nz "$_arch" "arch"
-  _write ";; -*- mode:skel -*-"
+  _write ";;; $INFRA_HOST_CONFIG -*- mode:skel -*-"
   _write ":arch \"$_arch\""
   kernel_version
   local _kernel_version="$RETVAL"