X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=install-my-scripts;h=0e36a4f86ec8f91db051b49f9c34cc115fc50a37;hp=dd52266a90fff8f16d08b427fd48d7902d956d5c;hb=HEAD;hpb=95eb9558206f8287febab80dd3f51d168a3ca831

diff --git a/install-my-scripts b/install-my-scripts
index dd52266..6d43952 100755
--- a/install-my-scripts
+++ b/install-my-scripts
@@ -1,5 +1,12 @@
 #!/bin/bash
-# Copyright (C) 2016 Ian Kelling
+# I, Ian Kelling, follow the GNU license recommendations at
+# https://www.gnu.org/licenses/license-recommendations.en.html. They
+# recommend that small programs, < 300 lines, be licensed under the
+# Apache License 2.0. This file contains or is part of one or more small
+# programs. If a small program grows beyond 300 lines, I plan to switch
+# its license to GPL.
+
+# Copyright 2024 Ian Kelling
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,10 +21,8 @@
 # limitations under the License.
 
 
-# Running these files directly won't be good since we are
-# unmounting the volume they live on.
-# This never really get's run, since we normally only
-# seed these files to other hosts using btrbk-run.
+# usage: run with no arguments.
+# Scripts that would interfere with unmounting /a, install them elsewhere.
 
 
 set -eE -o pipefail
@@ -40,33 +45,23 @@ if test -t 0; then
   }
 fi
 
-# scripts that would interfere with unmounting /a, put them elsewhere.
 # note: previously used the install command, but it had this habit of
 # like, once a month or so the files would be "not found" by a script
 # trying to use them, within a few minute of the last time this
 # ran. Very strange, dunno why, but rsync won't do anything unless these
 # changed, so that should fix it.
-/a/bin/log-quiet/setup
-rsync -t --chmod=755 --chown=root:root switch-mail-host btrbk-run mount-latest-subvol \
-      check-subvol-stale myi3status \
-      mailbindwatchdog \
-      check-mailq \
-      unsaved-buffers.el \
-      mail-backup-clean \
-      iptables-exim \
-      ip6tables-exim \
-      exim-nn-iptables \
-      check-crypttab \
-      /usr/local/bin
-rsync -t --chmod=755 --chown=root:root /a/bin/errhandle/err /usr/local/lib
-
-cmd=( rsync -aiSAX --chown=root:root --chmod=g-s
-      epanic-clean
-      system-status
-      btrfsmaint
-      mailtest-check
-      dynamic-ip-update /usr/local/bin
-    )
+
+
+rs() {
+  # some files are intentionally not executable in git
+  rsync -aSAX --chmod=755 --chown=root:root "$@"
+}
+
+source /a/bin/ds/script-files
+
+rs ${my_bin_files[@]} /usr/local/bin
+rs $my_lib_files /usr/local/lib
+
 
 sre() {
   service=$1
@@ -78,6 +73,9 @@ sre() {
 
 }
 
+tmpf=$(mktemp)
+# SAX are acls and things, dont use but whatever
+rs -i ${my_service_scripts[@]} /usr/local/bin >$tmpf
 while read -r line; do
   file="${line:12}"
   #echo debug: file: $file
@@ -93,4 +91,5 @@ while read -r line; do
       sre ${file//-/}
       ;;
   esac
-done < <("${cmd[@]}")
+done <$tmpf
+rm $tmpf