X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=afbb9562ba8b577fc18eebd766b85dd0fb59f3b6;hb=b87c76c4ad04f75a7dff371c65b5f065ba2839a4;hp=03c58408443153340df5557c75a221962c512975;hpb=d4a62c18b666ac9673181ab76f3e3d28fc784da6;p=distro-setup

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 #####