# HG changeset patch
# User Richard Westhaver <ellis@rwest.io>
# Date 1715037282 0
# Node ID 8b389e2e1a69b623ac0a53c9eba2fab92abd2753
# Parent  0a61207f30d7e2a11409a34312405bec8962a04f
defaults

diff -r 0a61207f30d7 -r 8b389e2e1a69 default.sxp
--- a/default.sxp	Mon May 06 18:51:19 2024 -0400
+++ b/default.sxp	Mon May 06 23:14:42 2024 +0000
@@ -1,6 +1,10 @@
 ;; -*- mode:skel -*-
 :sbcl-version "2.4.4" ;; SBCL is always required for bootstrap
 
+:cc "clang"
+
+:lisp "sbcl"
+
 :stash ".stash" ;; local build stash
 
 :dist nil ;; remote distribution directory, or nil to use the stash
@@ -10,3 +14,11 @@
 
 :log-level :debug ;; should usually be set to at least :DEBUG, set to
                   ;; :TRACE or T for verbose output
+
+:lisp-home "/usr/local/share/lisp"
+
+:quicklisp-home "/usr/local/share/lisp/quicklisp"
+
+:rust-home "/usr/local/share/rust"
+
+:cargo-home "/usr/local/share/rust/cargo"
diff -r 0a61207f30d7 -r 8b389e2e1a69 install.sh
--- a/install.sh	Mon May 06 18:51:19 2024 -0400
+++ b/install.sh	Mon May 06 23:14:42 2024 +0000
@@ -14,29 +14,20 @@
       ;;
   esac
 
-  local _url="https://packy.compiler.company/dist/${_arch}/cc-install${_ext}"
+  local _url="https://packy.compiler.company/dist/${_arch}"
   local _stash
   if ! _stash=".stash"; then
     # Because the previous command ran in a subshell, we must manually
     # propagate exit status.
     exit 1
   fi
-  local _file="${_stash}/cc-install${_ext}"
   ensure mkdir -p "$_stash"
-  printf '%s\n' 'info: starting cc-install...' 1>&2
-  ensure downloader "$_url" "$_file" "$_arch"
-  ensure chmod u+x "$_file"
-  if [ ! -x "$_file" ]; then
-    printf '%s\n' "Cannot execute $_file (likely because of mounting /tmp as noexec)." 1>&2
-    printf '%s\n' "Please copy the file to a location where you can execute binaries and run ./cc-install${_ext}." 1>&2
-    exit 1
-  fi
-  "$_file" "$@"
-  local _retval=$?
-  rm "$_file"
-  local _core_url="https://packy.compiler.company/dist/${_arch}/lisp/infra.core"
-  ensure downloader "$_core_url" "${_stash}/infra.core" "$_arch"
-  return "$_retval"
+  local _cc_url="${_url}/cc-install"
+  local _sbcl_url="${_url}/pack/sbcl.tar.zst"
+  local _rocksdb_url="${_url}/pack/rocksdb.tar.zst"
+  ensure downloader "$_sbcl_url" "${_stash}/sbcl.tar.zst" "$_arch"
+  ensure downloader "$_rocksdb_url" "${_stash}/rocksdb.tar.zst" "$_arch"
+  ensure downloader "$_cc_url" "${_stash}/cc-install" "$_arch"
 }
 
 say() {