catchup with lots of updates

[buildscripts] / kitty

diff --git a/kitty b/kitty
index ab611e6291bb235de6dbad695f987f7613960a18..2fa8372163dc956f72d02b84404833b3b1e9e484 100755 (executable)
--- a/kitty
+++ b/kitty
@@ -27,9 +27,10 @@ deps=(
 
 pi ${deps[@]}
 
+last_build=/a/opt/kitty-build-info/last-build
 cd /a/opt/kitty
 rev=$(cat $last_build 2>/dev/null) ||:
-head=$(git rev-parse HEAD)
+head=$(sudo -u zu git rev-parse HEAD)
 if ! $recompile && ! $bootstrap && [[ $rev == "$head" ]]; then
   :
 fi
@@ -44,6 +45,12 @@ if ! $rebuild && ! /bin/true; then
   rebuild=true
 fi
 
+err-cleanup() {
+  if mountpoint -q /usr/local/src/kitty; then
+    s umount /usr/local/src/kitty
+  fi
+}
+
 if $rebuild; then
   s mkdir -p /usr/local/src/kitty
   s mount -o bind /a/opt/kitty /usr/local/src/kitty
@@ -51,8 +58,12 @@ if $rebuild; then
   s install -o zu -g zu -d /usr/local/src/kitty
   s chown -hR zu.zu /usr/local/src/kitty
   cd /usr/local/src/kitty
-  m sudo -u zu firejail --read-write=/usr/local/src/kitty --profile=makekitty make clean
-  m sudo -u zu firejail --read-write=/usr/local/src/kitty --profile=makekitty make
+  # default plus go
+  p=PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/go/bin
+  gp=/usr/local/src/kitty/go
+  m sudo -u zu bash -c 'PATH=$PATH:/usr/local/go/bin; export GOPATH=/usr/local/src/kitty/go; go mod download -x'
+  m sudo -u zu firejail --read-write=/usr/local/src/kitty --profile=makekitty env PATH=$p make clean
+  m sudo -u zu firejail --read-write=/usr/local/src/kitty --profile=makekitty env PATH=$p GOPATH=$gp make
   cd /
   s umount /usr/local/src/kitty
   s chown -hR iank.iank /a/opt/kitty
@@ -62,3 +73,5 @@ cd /a/opt/kitty
 s rsync -ar --chown root:root --delete  __main__.py kitty logo kittens /usr/local/src/kitty
 s rsync -ar --chown root:root ./terminfo/x/xterm-kitty /usr/share/terminfo/x/xterm-kitty
 s ln -sf -T /usr/local/src/kitty/kitty/launcher/kitty /usr/local/bin/kitty
+
+echo $head >$last_build