various updates

[distro-setup] / filesystem / usr / local / bin / myupgrade

diff --git a/filesystem/usr/local/bin/myupgrade b/filesystem/usr/local/bin/myupgrade
index b990fbb70c080db20d91855c4c1d46931cd54bc1..1b39e7ff1c881f5b63432319b4a59aa13fa108de 100755 (executable)
--- a/filesystem/usr/local/bin/myupgrade
+++ b/filesystem/usr/local/bin/myupgrade
@@ -13,8 +13,19 @@ if [[ $HOSTNAME == "$MAIL_HOST" || $hn == li.b8.nz ]]; then
   exit 0
 fi
 
-/usr/sbin/checkrestart -v -i bash -b /a/bin/distro-setup/checkrestart-blacklist | \
-  sed '/^Found 0 processes using old versions of upgraded files$/d' >/var/log/checkrestart.log
+l() {
+  "$@" |& systemd-cat -t myupgrade
+}
+l /a/bin/buildscripts/tor-browser
+l /a/bin/buildscripts/go
+l /a/bin/buildscripts/rust
+l /a/bin/buildscripts/misc
+l go get -u mvdan.cc/fdroidcl
+
+cmd="$s /usr/sbin/checkrestart -p"
+if [[ $($cmd | sed '/^Found 0 processes using old versions of upgraded files$/d' | wc -l) != 0 ]]; then
+  $cmd -v | pee cat "wall -n"
+fi
 
 if [[ -s /var/log/checkrestart.log ]]; then
   for x in {30..1}; do
@@ -23,6 +34,7 @@ if [[ -s /var/log/checkrestart.log ]]; then
   done
   for x in {30..1}; do
     if ! fuser /var/lib/dpkg/lock &> /dev/null; then
+      echo "pid $PID. unattended upgrade, rebooting now" | pee cat "wall -n"
       /sbin/reboot
       exit 0
     fi