Merge pull request #3893 from pi-hole/tweak/dontdelete
Exit installer if directory already exists when trying to clone one of our repos into it
This commit is contained in:
commit
d59eab9a6e
|
@ -528,8 +528,10 @@ make_repo() {
|
|||
printf " %b %s..." "${INFO}" "${str}"
|
||||
# If the directory exists,
|
||||
if [[ -d "${directory}" ]]; then
|
||||
# delete everything in it so git can clone into it
|
||||
rm -rf "${directory}"
|
||||
# Return with a 1 to exit the installer. We don't want to overwrite what could already be here in case it is not ours
|
||||
str="Unable to clone ${remoteRepo} into ${directory} : Directory already exists"
|
||||
printf "%b %b%s\\n" "${OVER}" "${CROSS}" "${str}"
|
||||
return 1
|
||||
fi
|
||||
# Clone the repo and return the return code from this command
|
||||
git clone -q --depth 20 "${remoteRepo}" "${directory}" &> /dev/null || return $?
|
||||
|
|
Loading…
Reference in New Issue