From 8aa343cecbc31a795e3ea555f19de7b4bcba8355 Mon Sep 17 00:00:00 2001
From: Vladimir Panteleev <git@thecybershadow.net>
Date: Mon, 15 Jun 2020 15:08:15 +0000
Subject: [PATCH 1/2] scripts: Update beescrawl.dat file name after UUID
 removal

Commit 06e111c229331e152656e1840646a862a4410503 removed the UUID from
the beescrawl.dat file name, but this change was not also applied to
the wrapper script. Do that now.
---
 scripts/beesd.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/beesd.in b/scripts/beesd.in
index 216bc41..3f307f7 100755
--- a/scripts/beesd.in
+++ b/scripts/beesd.in
@@ -134,7 +134,7 @@ fi
     fi
     if (( "$OLD_SIZE" != "$NEW_SIZE" )); then
         INFO "Resize db: $OLD_SIZE -> $NEW_SIZE"
-        [ -f "$BEESHOME/beescrawl.$UUID.dat" ] && rm "$BEESHOME/beescrawl.$UUID.dat"
+        [ -f "$BEESHOME/beescrawl.dat" ] && rm "$BEESHOME/beescrawl.dat"
         truncate -s $NEW_SIZE $DB_PATH
     fi
     chmod 700 "$DB_PATH"

From 2427dd370eb28c39cefb597ac87d13c621fee95d Mon Sep 17 00:00:00 2001
From: Vladimir Panteleev <git@thecybershadow.net>
Date: Wed, 17 Jun 2020 06:59:43 +0000
Subject: [PATCH 2/2] scripts: Remove beescrawl.dat with -f

Avoid interactive prompts due to e.g. bad file modes.
---
 scripts/beesd.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/beesd.in b/scripts/beesd.in
index 3f307f7..ede3c4b 100755
--- a/scripts/beesd.in
+++ b/scripts/beesd.in
@@ -134,7 +134,7 @@ fi
     fi
     if (( "$OLD_SIZE" != "$NEW_SIZE" )); then
         INFO "Resize db: $OLD_SIZE -> $NEW_SIZE"
-        [ -f "$BEESHOME/beescrawl.dat" ] && rm "$BEESHOME/beescrawl.dat"
+        rm -f "$BEESHOME/beescrawl.dat"
         truncate -s $NEW_SIZE $DB_PATH
     fi
     chmod 700 "$DB_PATH"