From a093099e821e037c70ee24185a8c48d168c0f17b Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Wed, 7 Sep 2022 16:01:17 +0100
Subject: [PATCH] Remove old packages from store, before copying in newly built
 one.

---
 source/cpan-modules/cpan-modules.SlackBuild | 7 ++++---
 templates/template.SlackBuild               | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/source/cpan-modules/cpan-modules.SlackBuild b/source/cpan-modules/cpan-modules.SlackBuild
index cc87c31..ad5d076 100755
--- a/source/cpan-modules/cpan-modules.SlackBuild
+++ b/source/cpan-modules/cpan-modules.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Version: 0.6.4
+# Version: 0.6.5
 # Copyright (c) 2005-2022:
 #   Darren 'Tadgy' Austin <darren (at) afterdark.org.uk>
 # Licensed under the terms of the GNU General Public License version 3.
@@ -350,8 +350,9 @@ makepkg -l y -p -c n --acls --xattrs "$BUILD_WORKDIR/$PKG_NAME-${PKG_VERSION//-/
 (( ${BUILD_CLEANUP:-1} == 1 )) && rm -rf "$BUILD_ROOT" "${SRC_DIRNAMES[@]/#/$BUILD_WORKDIR/}"
 
 # Move package to the store.
-mkdir -p -m 755 "$PKG_STORE" && mv --backup=numbered "$BUILD_WORKDIR/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}.$PKG_EXT" \
-    "$PKG_STORE" || die "Failed to move package to store - package left in $BUILD_WORKDIR"
+{ mkdir -p -m 755 "$PKG_STORE" && rm -f "$PKG_STORE/$PKG_NAME"* && \
+    mv "$BUILD_WORKDIR/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}.$PKG_EXT" "$PKG_STORE"; } || \
+    die "Failed to move package to store - package left in $BUILD_WORKDIR"
 
 printf "\\033[1;32;40m%s:\\n  %s\\033[0;39m\\n" "Package built and moved to store" \
     "$PKG_STORE/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}.$PKG_EXT"
diff --git a/templates/template.SlackBuild b/templates/template.SlackBuild
index a414e8f..68c89c2 100755
--- a/templates/template.SlackBuild
+++ b/templates/template.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Version: 0.6.4
+# Version: 0.6.5
 # Copyright (c) 2005-2022:
 #   Darren 'Tadgy' Austin <darren (at) afterdark.org.uk>
 # Licensed under the terms of the GNU General Public License version 3.
@@ -333,8 +333,9 @@ makepkg -l y -p -c n --acls --xattrs "$BUILD_WORKDIR/$PKG_NAME-${PKG_VERSION//-/
 (( ${BUILD_CLEANUP:-1} == 1 )) && rm -rf "$BUILD_ROOT" "${SRC_DIRNAMES[@]/#/$BUILD_WORKDIR/}"
 
 # Move package to the store.
-mkdir -p -m 755 "$PKG_STORE" && mv --backup=numbered "$BUILD_WORKDIR/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}.$PKG_EXT" \
-    "$PKG_STORE" || die "Failed to move package to store - package left in $BUILD_WORKDIR"
+{ mkdir -p -m 755 "$PKG_STORE" && rm -f "$PKG_STORE/$PKG_NAME"* && \
+    mv "$BUILD_WORKDIR/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}.$PKG_EXT" "$PKG_STORE"; } || \
+    die "Failed to move package to store - package left in $BUILD_WORKDIR"
 
 printf "\\033[1;32;40m%s:\\n  %s\\033[0;39m\\n" "Package built and moved to store" \
     "$PKG_STORE/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}.$PKG_EXT"