X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=55d7a02489dc6b1d1ae3cbf7d0f3152778d73215;hb=6061d88c7d5beda3e974943eb8676f7c39d4ae9f;hp=fdd3bd6072e07c25d802e132f0a828abb9605230;hpb=3f878090bcbab55fb07cca8cc840b4817c6eb7c5;p=distro-setup

diff --git a/conflink b/conflink
index fdd3bd6..55d7a02 100755
--- a/conflink
+++ b/conflink
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 source /a/bin/errhandle/err
-_errcatch_cleanup() {
+errcatch-cleanup() {
   echo 1 >~/.local/conflink
 }
 
@@ -24,14 +24,26 @@ m() {
 s() { sudo "$@"; }
 
 lnf() { /a/exe/lnf "$@"; }
+
+# error prone
+#f=~/.local/conflink
+# fast=false
+# if [[ -e $f ]] && (( $(stat -c %Y $f) > $now - 60*60*24 )); then
+#   fast=true
+# fi
 if [[ $1 == -f ]]; then # f for fast
-  lnf() { ln -sf "$@"; }
+  fast=true
+  shift
 elif
   [[ $1 ]]; then
   echo "error: unrecognized arguments" >&2
   exit 0
 fi
 
+if $fast; then
+  lnf() { ln -sf "$@"; }
+fi
+
 shopt -s nullglob
 shopt -s extglob
 shopt -s dotglob
@@ -66,14 +78,23 @@ subdir-link-r() {
 }
 
 
-
 common-file-setup() {
-  local dir fs x f
+  local dir fs x f systemd_reload
+  systemd_reload=false
   for dir in "$@"; do
     fs=$dir/filesystem
     if [[ -e $fs && $user =~ ^iank?$ ]]; then
+      # this could be done with rsync, something like this,
+      # but I haven't looked at the symlinks.
+      # s rsync -n -ahviSAXPH --specials --devices --chown=root:root --chmod=g-s $fs /
       # note, symlinks get resolved, not copied.
-      s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -xz -C /
+      if s tar --anchored \
+           --exclude etc/dovecot/users \
+           --exclude etc/exim4/passwd \
+           --exclude etc/exim4/*.pem \
+           --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -dz -C / | grep /etc/systemd &>/dev/null; then
+        systemd_reload=true
+      fi
     fi
 
     if [[ -e $dir/subdir_files ]]; then
@@ -83,6 +104,9 @@ common-file-setup() {
     (( ${#x[@]} >= 1 )) || continue
     m lnf ${x[@]} ~
   done
+  if $systemd_reload; then
+    m s systemctl daemon-reload
+  fi
 }
 
 user=$(id -un)
@@ -155,4 +179,3 @@ case $user in
     echo "$0: error: unexpected user"; exit 1
     ;;
 esac
-