minor bug fix

[distro-setup] / system-status

diff --git a/system-status b/system-status
index e137d06f3b4b15c44b884e6dc04e8eb17d0a3759..b3c22e4ea8126f1a24330b039aceef3803ed1d03 100755 (executable)
--- a/system-status
+++ b/system-status
@@ -13,6 +13,15 @@ status_file=/dev/shm/iank-status
 shopt -s nullglob
 shopt -s dotglob
 
+verbose=false
+if [[ $1 ]]; then
+  verbose=true
+fi
+v() {
+  if $verbose; then
+    printf "%s\n" "$*"
+  fi
+}
 lo() { /usr/local/bin/log-once "$@"; }
 
 write-status() {
@@ -36,41 +45,83 @@ write-status() {
     chars+=("MAILPING!")
   fi
 
-  qlen=$(/usr/sbin/exiqgrep -o 60 -c -b | awk '{print $1}')
+  if ! qlen=$(/usr/sbin/exiqgrep -o 60 -c -b | awk '{print $1}'); then
+    # early in install process, we dont have permission yet for exiqgrep
+    qlen=$(sudo /usr/sbin/exiqgrep -o 60 -c -b | awk '{print $1}')
+  fi
   if ((qlen)); then
     chars+=("q $qlen")
   fi
 
+  begin=false
   cd /b/ds
   if ! make -q ~/.local/distro-begin || [[ $(<~/.local/distro-begin) != 0 ]]; then
-    chars+=("DISTRO-BEGIN!")
+    begin=true
   fi
 
+  end=false
   if ! make -q ~/.local/distro-end || [[ $(<~/.local/distro-end) != 0 ]]; then
+    end=true
+  fi
+
+  if $begin && $end; then
+    chars+=("DISTRO!")
+  elif $begin; then
+    chars+=("DISTRO-BEGIN!")
+  elif $end; then
     chars+=("DISTRO-END!")
   fi
 
   f=~/.local/conflink
-  if [[ -e $f ]]; then
-    now=$(date +%s)
-    fsec=$(stat -c%Y $f)
-    fmin=$(( (fsec - now ) / 60 + 1 ))
-    fminplus=$(( fmin + 60*24 ))
-    # Filesystem files get copied, so find any newer than the last run.
-    # The rest are hueristics:
-    # Given the last time we added a file in git, is that newer than the last conflink run.
-    # Given new files not added to git, were they modified more recently than the last conflink? but,
-    # push their modification time back by a day so we can develop them before needing to add them to git.
-    if (( $(date -d "$(git log --diff-filter=ACR --format=%aD -1)" +%s) > fsec )) || \
-         [[ $(find {/a/bin/ds,/p/c}{/filesystem,/machine_specific/$HOSTNAME/filesystem} -mmin $fmin -type f -print -quit 2>/dev/null) ]] \
-         || [[ $(find $(git ls-files -o --exclude-standard) -mmin $fminplus -type f -print -quit) ]]; then
+  for _ in 1; do
+    if [[ -e $f ]]; then
+      now=$(date +%s)
+      fsec=$(stat -c%Y $f)
+      # the / 60 makes it 0-59 seconds less strict, +1 makes sure we
+      # dont have any false positives.
+      fmin=$(( (fsec - now ) / 60 + 1 ))
+      fminplus=$(( fmin + 60*24 ))
+      # Filesystem files get copied, so find any newer than the last run.
+      # The rest are hueristics:
+      # Given the last time we added a file in git, is that newer than the last conflink run.
+      # Given new files not added to git, were they modified more recently than the last conflink? but,
+      # push their modification time back by a day so we can develop them before needing to add them to git.
+
+      all_dirs=({/a/bin/ds,/p/c}{/filesystem,/machine_specific/$HOSTNAME/filesystem})
+      # This part is copied from conflink
+      for x in /p/c/machine_specific/*.hosts /a/bin/ds/machine_specific/*.hosts; do
+        if grep -qxF $HOSTNAME $x; then all_dirs+=( ${x%.hosts} ); fi
+      done
+
+      # just because i forget a lot, -mmin -NUM means files modified <= NUM minutes ago
+      if (( $(date -d "$(git log --diff-filter=ACR --format=%aD -1)" +%s) > fsec )) || \
+           [[ $(find ${all_dirs[@]} -mmin $fmin -type f -print -quit 2>/dev/null) ]]; then
+        v conflink newer git or newer filesystem files
+        chars+=("CONFLINK!")
+        break
+      fi
+
+      for d in /a/bin/distro-setup /p/c; do
+        cd $d
+        if [[ ! -e .git ]]; then
+          # some hosts i dont push all of /p/c
+          continue
+        fi
+        untracked=$(git ls-files -o --exclude-standard)
+        if [[ $untracked && $(find $untracked -mmin $fminplus -type f -print -quit) ]]; then
+          v conflink: untracked in $d
+          chars+=("CONFLINK!")
+          break
+        fi
+      done
+
+    fi
+    if [[ ! -e $f || $(<$f) != 0 ]]; then
+      v conflink: last run not found or failed
       chars+=("CONFLINK!")
+      break
     fi
-  fi
-
-  if [[ ! -e $f || $(<$f) != 0 ]]; then
-    chars+=("CONFLINK!")
-  fi
+  done
 
 
   ## Clean the paniclog, but only up to 4 times per day, or else we
@@ -123,7 +174,7 @@ write-status() {
       fi
     done
     if (( maxtime < now - 60*60 )); then
-      chars+=("OLD-SNAPSHOT!")
+      chars+=("OLD-SNAP!")
       snapshotmsg="/o snapshot older than 1 hour"
     fi
     lo -1 old-snapshot $snapshotmsg