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

Will now check for symlinks too

Browse source
This commit is contained in:
JeremyStar™ 2024-03-10 22:23:33 +01:00
parent b4af1cb111
commit 99232da3a1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
buildtool.sh
View file

@ -286,10 +286,10 @@ function ask_debug() {
} }
## Ask for clone directory conflict resolution (includes check) ## Ask for clone directory conflict resolution (includes check)
function ask_clonedir_conflictresolution() { function ask_clonedir_conflictresolution() {
if [ ! -d "${BUILDTOOL_CLONEDIR}" ]; then if [ ! -d "${BUILDTOOL_CLONEDIR}" ] && [ ! -L "${BUILDTOOL_CLONEDIR}" ]; then
return return
elif [ -a "${BUILDTOOL_CLONEDIR}" ] && [ ! -d "${BUILDTOOL_CLONEDIR}" ]; then elif [ -a "${BUILDTOOL_CLONEDIR}" ] && [ ! -d "${BUILDTOOL_CLONEDIR}" ] && [ ! -L "${BUILDTOOL_CLONEDIR}" ]; then
warnh "Something that isn't a directory exists at location \"${BUILDTOOL_CLONEDIR}\"" warnh "Something that isn't a directory or symlink exists at location \"${BUILDTOOL_CLONEDIR}\""
fi fi
read -rp "$(infoh "Warning: \"${BUILDTOOL_CLONEDIR}\" already exists. What should be done to resolve the conflict [A(bort)/r(ecompile)/f(resh)]? ")" BUILDTOOL_CLONEDIR_CONFLICT read -rp "$(infoh "Warning: \"${BUILDTOOL_CLONEDIR}\" already exists. What should be done to resolve the conflict [A(bort)/r(ecompile)/f(resh)]? ")" BUILDTOOL_CLONEDIR_CONFLICT
case "${BUILDTOOL_CLONEDIR_CONFLICT}" in case "${BUILDTOOL_CLONEDIR_CONFLICT}" in
@ -302,7 +302,7 @@ function ask_clonedir_conflictresolution() {
;; ;;
"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."