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

Fix conflict resolution with local dir enabled

Browse source
This commit is contained in:
JeremyStar™ 2024-03-11 01:51:22 +01:00
parent b9311c9953
commit ce6e652408
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

@ -80,7 +80,7 @@ fi
errore "set the \$BUILDTOOL_COMPILE_NONARCH environment variable to \"true\"" errore "set the \$BUILDTOOL_COMPILE_NONARCH environment variable to \"true\""
exit 1 exit 1
else else
warnh "Compiling on a non-arch distribution. This may lead to unexpected errors!" warnh "\$BUILDTOOL_COMPILE_NONARCH is set, allowing compiling on a non-arch distribution"
fi fi
fi fi
) )
@ -303,7 +303,11 @@ function ask_clonedir_conflictresolution() {
if [ -n "${BUILDTOOL_LOCALDIR}" ]; then if [ -n "${BUILDTOOL_LOCALDIR}" ]; then
warnh "Skipped conflict resolution (\$BUILDTOOL_LOCALDIR is set)" warnh "Skipped conflict resolution (\$BUILDTOOL_LOCALDIR is set)"
export "BUILDTOOL_CLONEDIR_CONFLICT=r" export "BUILDTOOL_CLONEDIR_CONFLICT=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
return return
fi fi
if [ ! -d "${BUILDTOOL_CLONEDIR}" ] && [ ! -L "${BUILDTOOL_CLONEDIR}" ]; then if [ ! -d "${BUILDTOOL_CLONEDIR}" ] && [ ! -L "${BUILDTOOL_CLONEDIR}" ]; then