JeremyStarTM/jstm-optimized
JeremyStarTM/jstm-optimized
1
0
Fork 0
Code Issues 1 Pull requests Releases Activity

Fix conflict resolution (again)

Browse source
This commit is contained in:
JeremyStar™ 2024-03-11 00:36:21 +01:00
parent 075b11ae42
commit f1ac0f0f82
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
buildtool.sh
View file

@ -314,14 +314,18 @@ function ask_clonedir_conflictresolution() {
exit 1 exit 1
;; ;;
"r"|"R") "r"|"R")
export "BUILDTOOL_MAKEPKG_REUSE= --noextract --force" if [ -a "${BUILDTOOL_CLONEDIR}/src" ]; then
export "BUILDTOOL_MAKEPKG_REUSE= --noextract"
elif [ -a "${BUILDTOOL_CLONEDIR}/pkg" ]; then
export "BUILDTOOL_MAKEPKG_REUSE=${BUILDTOOL_MAKEPKG_REUSE} --force"
fi
;; ;;
"f"|"F") "f"|"F")
infoh "Removing existing \$BUILDTOOL_CLONEDIR directory" infoh "Removing existing \$BUILDTOOL_CLONEDIR directory"
rm -rf "${BUILDTOOL_CLONEDIR}" rm -rf "${BUILDTOOL_CLONEDIR}"
;; ;;
*) *)
errorh "Invalid answer. Please answer with Y, N or I." errorh "Invalid answer. Please answer with Y, N or I"
ask_debug ask_debug
esac esac
} }