From e81ac02c3c177cdfb148395bd7fdba328361869d Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Wed, 27 Apr 2022 23:18:48 -0400
Subject: [PATCH] minor fixes

---
 distro-begin | 16 +++++++++++++---
 mail-setup   |  3 ++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/distro-begin b/distro-begin
index ef18bbd..25247dc 100755
--- a/distro-begin
+++ b/distro-begin
@@ -319,13 +319,16 @@ if [[ ! -e $f ]]; then
   sudo sed -i --follow-symlinks 's/^ *hosts:.*/hosts: files dns myhostname/' $f
 fi
 case $HOSTNAME in
-  bk)
+  bk|je)
+    # je should be able to get along systemd-resolved, but ive had some odd
+    # very intermittent dns failures with spamassassin, it seems it might only
+    # be happening with systemd-resolved, so just use unbound
+    # to make it consistent with the other hosts.
     sudo sed -i --follow-symlinks 's/^ *hosts:.*/hosts: files dns myhostname/' /etc/nsswitch.conf
     soff systemd-resolved
     sudo ln -sf 127.0.0.1-resolv/stub-resolv.conf /etc/resolv.conf
     sgo unbound
-    sgo named
-    # cautious measure to make sure bind is up
+    # cautious measure to make sure resolution is working
     sleep 1
     ;;
   *)
@@ -340,6 +343,13 @@ case $HOSTNAME in
     ;;
 esac
 
+case $HOSTNAME in
+  bk)
+    sgo named
+    ;;
+esac
+
+
 f=/etc/apparmor.d/abstractions/nameservice
 if [[ -e $f ]] && ! grep -q /etc/resolved-nsswitch/nsswitch.conf $f; then
   sudo sed -i '/\/etc\/nsswitch.conf/a /etc/resolved-nsswitch/nsswitch.conf r,' $f
diff --git a/mail-setup b/mail-setup
index d3d1056..abd8633 100755
--- a/mail-setup
+++ b/mail-setup
@@ -287,7 +287,8 @@ i() { # install file
   local base="${dest##*/}"
   local dir="${dest%/*}"
   if [[ $dir != "$base" ]]; then
-    mkdir -p ${dest%/*}
+    # dest has a directory component
+    mkdir -p "$dir"
   fi
   ir=false # i result
   tmpdir=$(mktemp -d)
-- 
2.30.2