X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=d661e172dfd5a5b1d2f5790236221dfc59f62232;hb=e72acaee4cf7c394ca0e35b84d3afbd8ef5a4b32;hp=18a6ed84f0dc177c85e72ccf0aaa5adc075e93ca;hpb=1b4699d0e925e873b88137b1e07dfd24bac0ac49;p=distro-setup

diff --git a/conflink b/conflink
index 18a6ed8..d661e17 100755
--- a/conflink
+++ b/conflink
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 err-cleanup() {
   echo 1 >~/.local/conflink
 }
@@ -242,8 +242,6 @@ case $user in
 
     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 #####