minor bug fix

[distro-setup] / conflink

diff --git a/conflink b/conflink
index bb5d480d4ee04d7c235ba25fd7dff78dfa70374e..0ae24c332cce236812b3d2521bd332edd8f96934 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -1,14 +1,49 @@
 #!/bin/bash
 
 source /a/bin/errhandle/err
+_errcatch_cleanup() {
+  echo 1 >~/.local/conflink
+}
+
+
+usage() {
+  cat <<EOF
+Usage: ${0##*/} [OPTIONS]
+Link or otherwise install configuration files.
+
+-f   For fast. Dont use lnf, use ln -sf. Good for updating existing files.
+EOF
+  exit $1
+}
+
 
 m() {
   echo "$*"
   "$@"
 }
 s() { sudo "$@"; }
-lnf() { /a/exe/lnf "$@"; }
 
+lnf() { /a/exe/lnf "$@"; }
+now=$(date +%s)
+
+# 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
+  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
@@ -44,13 +79,19 @@ 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.
+      if s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -dz -C / | grep /etc/systemd &>/dev/null; then
+        systemd_reload=true
+      fi
       s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -xz -C /
     fi
 
@@ -61,10 +102,13 @@ common-file-setup() {
     (( ${#x[@]} >= 1 )) || continue
     m lnf ${x[@]} ~
   done
+  if $systemd_reload; then
+    m s systemctl daemon-reload
+  fi
 }
 
 user=$(id -un)
-all_dirs=({/a/c,/p/c}{,/machine_specific/$HOSTNAME})
+all_dirs=({/a/bin/ds,/p/c}{,/machine_specific/$HOSTNAME})
 # note, we assume a group of hosts does not have the
 # same name as a single host, which is no problem on our scale.
 for x in /p/c/machine_specific/*.hosts /a/bin/ds/machine_specific/*.hosts; do
@@ -113,9 +157,18 @@ case $user in
 
     ##### end special extra stuff #####
 
-    sudo bash -c 'shopt -s nullglob; cd /etc/openvpn; for f in client/* server/*; do ln -sf $f .; done'
+    if [[ -e /etc/openvpn ]]; then
+      sudo bash -c 'shopt -s nullglob && cd /etc/openvpn && for f in client/* server/*; do ln -sf $f .; done'
+    fi
 
     m sudo -H -u user2 "${BASH_SOURCE[0]}"
+
+    f=/a/bin/distro-setup/system-status
+    if [[ -x $f ]]; then
+      $f _
+    fi
+    echo 0 >~/.local/conflink
+
     ;;
   user2)
     m common-file-setup ${c_dirs[@]}