crashrecovery: reduce i/o by scoping find

Closes #345
graysky2 · May 25, 2024 · 9491a03 · 9491a03
1 parent 96838cf
commit 9491a03
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 6.50
+VERSION = 6.51
 PN = profile-sync-daemon
 
 PREFIX ?= /usr

diff --git a/common/profile-sync-daemon.in b/common/profile-sync-daemon.in
@@ -368,7 +368,7 @@ cleanup() {
       local CRASHArr=()
       while IFS= read -d '' -r backup; do
         CRASHArr=("${CRASHArr[@]}" "$backup")
-      done < <(find "${DIR%/*}" -type d -name '*crashrecovery*' -print0 | sort -r -z)
+      done < <(find "${DIR%/*}" -maxdepth 1 -type d -name "${DIR##*/}-backup-crashrecovery-*" -print0 | sort -r -z)
 
       if [[ ${#CRASHArr[@]} -gt 0 ]]; then
         echo -e "${BLD}Deleting ${#CRASHArr[@]} crashrecovery dir(s) for profile ${BLU}$DIR${NRM}"
@@ -590,7 +590,7 @@ enforce() {
     local CRASHArr=()
     while IFS= read -d '' -r backup; do
       CRASHArr=("${CRASHArr[@]}" "$backup")
-    done < <(find "${DIR%/*}" -type d -name '*crashrecovery*' -print0 | sort -r -z)
+    done < <(find "${DIR%/*}" -maxdepth 1 -type d -name "${DIR##*/}-backup-crashrecovery-*" -print0 | sort -r -z)
 
     if [[ ${#CRASHArr[@]} -gt $BACKUP_LIMIT ]]; then
       for remove in "${CRASHArr[@]:$BACKUP_LIMIT}"; do
@@ -686,7 +686,7 @@ parse() {
         local CRASHArr=()
         while IFS= read -d '' -r backup; do
           CRASHArr=("${CRASHArr[@]}" "$backup")
-        done < <(find "${DIR%/*}" -type d -name '*crashrecovery*' -print0 | sort -r -z)
+        done < <(find "${DIR%/*}" -maxdepth 1 -type d -name "${DIR##*/}-backup-crashrecovery-*" -print0 | sort -r -z)
 
         # get permissions on profile dir and be smart about it since symlinks are all 777
         [[ -f $PID_FILE ]] && TRUEP=$(stat -c %a "$BACKUP") || TRUEP=$(stat -c %a "$DIR")