From 43696edbc8f08d05beb15303d5b8d74e9d3ace53 Mon Sep 17 00:00:00 2001
From: JeremyStarTM <jeremystartm@staropensource.de>
Date: Sun, 10 Mar 2024 22:17:00 +0100
Subject: [PATCH] Fix reusing clone dir

---
 buildtool.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/buildtool.sh b/buildtool.sh
index 304c650..b414075 100755
--- a/buildtool.sh
+++ b/buildtool.sh
@@ -297,7 +297,9 @@ function ask_clonedir_conflictresolution() {
 			errorh "Conflict resolution failed"
 			exit 1
 			;;
-		"r"|"R") ;;
+		"r"|"R")
+			export "BUILDTOOL_MAKEPKG_REUSE= --noextract"
+			;;
 		"f"|"F")
 			infoh "Removing existing \$BUILDTOOL_CLONEDIR directory"
 			#rm -rf "${BUILDTOOL_CLONEDIR}"
@@ -361,7 +363,7 @@ fi
 
 # Build package
 infoh "Building package"
-if ! ${BUILDTOOL_BUILDCMDLINE} "${BUILDTOOL_PKGBUILD_XCONFIG}" "${BUILDTOOL_PKGBUILD_NCONFIG}" "${BUILDTOOL_PKGBUILD_CPFINALCONFIG}" "${BUILDTOOL_PKGBUILD_MODPROBEDDB}" "${BUILDTOOL_PKGBUILD_SUBARCHITECTURE}" "${BUILDTOOL_PKGBUILD_DEBUG}" makepkg --syncdeps -p PKGBUILD.buildtool; then
+if ! ${BUILDTOOL_BUILDCMDLINE} "${BUILDTOOL_PKGBUILD_XCONFIG}" "${BUILDTOOL_PKGBUILD_NCONFIG}" "${BUILDTOOL_PKGBUILD_CPFINALCONFIG}" "${BUILDTOOL_PKGBUILD_MODPROBEDDB}" "${BUILDTOOL_PKGBUILD_SUBARCHITECTURE}" "${BUILDTOOL_PKGBUILD_DEBUG}" makepkg --syncdeps${BUILDTOOL_MAKEPKG_REUSE} -p PKGBUILD.buildtool; then
 	errorh "Failed package compilation: makepkg returned with non-zero exit code"
 	errore "Please report this at \"${BUILDTOOL_ISSUETRACKER}\""
 	exit 1