remove references to loop files (they may change), remove associated TODO, small cleanups

1 files changed, 8 insertions, 7 deletions

diff --git a/bin/build-master-status b/bin/build-master-status
index f901d0a..0e83d5b 100755
--- a/bin/build-master-status
+++ b/bin/build-master-status
@@ -122,7 +122,7 @@ testing=$(
   (
     find "${work_dir}/build-list.loops" -maxdepth 1 -regextype grep \
       -regex '.*/loop_[0-9]\+' \
-      -exec cat {} \; | \
+      -exec cat '{}' \; | \
       sort -u
     find "${work_dir}/package-states/" -maxdepth 1 -name '*.broken' -printf '%f\n' | \
       sed 's|\(\.[^.]\+\)\{4\}||' | \
@@ -146,13 +146,14 @@ locked=$(
     wc -l
 )
 loops=$(
-  find "${work_dir}/build-list.loops" -maxdepth 1 | \
-    grep -c '/loop_[0-9]\+$'
-) || true
+  find "${work_dir}/build-list.loops" -maxdepth 1 -regextype grep \
+    -regex '.*/loop_[0-9]\+' | \
+    wc -l
+)
 looped_packages=$(
-  find "${work_dir}/build-list.loops" -maxdepth 1 | \
-    grep '/loop_[0-9]\+$' | \
-    xargs -r cat | \
+  find "${work_dir}/build-list.loops" -maxdepth 1 -regextype grep \
+    -regex '.*/loop_[0-9]\+' \
+    -exec cat '{}' \; | \
     sort -u | \
     wc -l
 )