From b87c76c4ad04f75a7dff371c65b5f065ba2839a4 Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Fri, 12 May 2023 00:55:37 -0400
Subject: [PATCH] fixes

---
 conflink   | 4 +++-
 distro-end | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/conflink b/conflink
index 03c5840..afbb956 100755
--- a/conflink
+++ b/conflink
@@ -244,8 +244,10 @@ case $user in
       fi
     fi
 
-    if [[ -d /var/lib/bitcoind ]]; then
+    if [[ -d /var/lib/bitcoind && -d /p/c/user-specific/bitcoin ]]; then
       s rsync -clpgoDiSAX --chmod=Dg-s --chown=bitcoin:bitcoin /p/c/user-specific/bitcoin/settings.json /var/lib/bitcoind
+      # i'm not sure of the perfect permissions here, but
+      # 640 seems good.
       s rsync -rclpgoDiSAX --chmod=Dg-s --chown=root:bitcoin /p/c/user-specific/bitcoin/bitcoin /etc
     fi
     ##### end special extra stuff #####
diff --git a/distro-end b/distro-end
index 3d3a9e1..6463040 100755
--- a/distro-end
+++ b/distro-end
@@ -2176,12 +2176,13 @@ esac
 
 case $HOSTNAME in
   sy|kd)
-    sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-24.1/bin/*
+    sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-24.0.1/bin/*
     sgo bitcoind
     # note: the bitcoin user & group are setup in fai
     sudo usermod -a -G bitcoin iank
+    # todo: make bitcoin have a stable uid/gid
     if [[ ! $(readlink -f /var/lib/bitcoind/wallets) == /q/wallets ]]; then
-      sudo lnf /q/wallets /var/lib/bitcoind
+      s lnf /q/wallets /var/lib/bitcoind
       sudo chown -h bitcoin:bitcoin /var/lib/bitcoind/wallets
     fi
     # note, there exists
-- 
2.30.2