tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Adam Warner 2020-12-02 20:51:16 +00:00 committed by GitHub
parent db231ded91 e47eb30a6e
commit d59eab9a6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
automated install/basic-install.sh
View File

@ -528,8 +528,10 @@ make_repo() {
printf " %b %s..." "${INFO}" "${str}" printf " %b %s..." "${INFO}" "${str}"
# If the directory exists, # If the directory exists,
if [[ -d "${directory}" ]]; then if [[ -d "${directory}" ]]; then
# delete everything in it so git can clone into it # 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
rm -rf "${directory}" str="Unable to clone ${remoteRepo} into ${directory} : Directory already exists"
printf "%b %b%s\\n" "${OVER}" "${CROSS}" "${str}"
return 1
fi fi
# Clone the repo and return the return code from this command # Clone the repo and return the return code from this command
git clone -q --depth 20 "${remoteRepo}" "${directory}" &> /dev/null || return $? git clone -q --depth 20 "${remoteRepo}" "${directory}" &> /dev/null || return $?