From 9de134ab81ba8b62daaf276e02f06d5499d0aa3c Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Tue, 23 Apr 2024 23:32:34 -0400
Subject: [PATCH] new host related fixes

---
 brc2              |  2 +-
 distro-begin      |  2 +-
 distro-end        | 14 +++++++-------
 dsremote          |  3 +--
 mail-backup-clean |  4 ++++
 pkgs              |  3 ++-
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/brc2 b/brc2
index 33384bc..2795e2e 100644
--- a/brc2
+++ b/brc2
@@ -4480,7 +4480,7 @@ hssh-update() {
   case $HOSTNAME in
     sy|kd)
       hosts=(
-        kd x3.office.fsf.org syw
+        kd.b8.nz x3.office.fsf.org syw x2.b8.nz
       )
       ;;
     x3)
diff --git a/distro-begin b/distro-begin
index 4638980..8da3f16 100755
--- a/distro-begin
+++ b/distro-begin
@@ -55,7 +55,7 @@
 
 
 ### make ssh interactive shell run better. for when running line interactively line by line
-sudo bash -c '/a/exe/ssh-emacs-setup'
+sudo bash -c '/a/exe/ssh-emacs-setup' || exit $?
 
 ##### setup error handling
 interactive=true  # set this to false to force set -x
diff --git a/distro-end b/distro-end
index 77cfa4b..e9b797a 100755
--- a/distro-end
+++ b/distro-end
@@ -167,8 +167,6 @@ EOF
       t=$(mktemp)
       case $n in
         bookworm)
-          cat >$t <<'EOF'
-EOF
           cat >$t <<EOF
 deb http://deb.debian.org/debian bookworm main
 deb-src http://deb.debian.org/debian bookworm main
@@ -194,11 +192,13 @@ EOF
     if $doupdate; then
       tmpdir=$(mktemp -d)
       cd $tmpdir
-      # otherwise we get a warning message:
-      # W: Download is performed unsandboxed as root as file '/tmp/tmp.UwxbPFG3CZ/debian-archive-keyring_2021.1.1+deb11u1_all.deb' couldn't be accessed by user '_apt'. - pkgAcquire::Run (13: Permission denied)
-      chmod 775 .
-      p download debian-archive-keyring
-      s dpkg -i ./debian-archive-keyring*
+      # cant apt get the keyring without doing an update, can't update
+      # without the keyring, this is a stupid chicken and egg problem
+      # that apt should have some feature to solve, but doesn't as far
+      # as I know.
+      f=debian-archive-keyring_2023.3+deb12u1_all.deb
+      wget http://ftp.debian.org/debian/pool/main/d/debian-archive-keyring/$f
+      dpkg -i $f
       p update
       cd -
       rm -rf $tmpdir
diff --git a/dsremote b/dsremote
index 65e27c0..31d85e1 100755
--- a/dsremote
+++ b/dsremote
@@ -35,5 +35,4 @@ if [[ ! $host || $host == -h ]]; then
 fi
 
 bbk -t $host
-ssh $host /a/bin/distro-setup/distro-begin
-ssh $host /a/bin/distro-setup/distro-end
+ssh -t $host "/a/bin/distro-setup/distro-begin && /a/bin/distro-setup/distro-end"
diff --git a/mail-backup-clean b/mail-backup-clean
index 9f6b14b..210173c 100755
--- a/mail-backup-clean
+++ b/mail-backup-clean
@@ -38,4 +38,8 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" exit status: $?, PIPESTATUS: ${P
 # time=$(( $(date -d $(sed -r  's/(.{4})(..)(.{5})(..)(.*)/\1-\2-\3:\4:\5/' <<<$last_snap_date) +%s) -1 ))
 # find /bu/md -type f \! -newermt @$time -delete
 
+if [[ ! -d /bu/md ]]; then
+  exit 0
+fi
+
 find /bu/md -type f -mtime +100 -delete
diff --git a/pkgs b/pkgs
index e55f92c..ee3efb9 100644
--- a/pkgs
+++ b/pkgs
@@ -136,7 +136,8 @@ p3=(
   evince
   exim4-doc-html
   exfat-fuse
-  exfat-utils
+  # was exfat-utils before aramo
+  exfatprogs
   expect
   # for ftp upload dejagnu test
   libdate-manip-perl libemail-messageid-perl
-- 
2.30.2