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

Wild experimentations to see what circle does...

This commit is contained in:
Adam Warner 2020-02-16 10:53:49 +00:00
parent 5367761311
commit 31132aa4ec
No known key found for this signature in database
GPG Key ID: 872950F3ECF2B173
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
install.sh Executable file → Normal file
View File

@ -63,11 +63,11 @@ webInterfaceDir="${webInterfaceDir}"
#git clone --branch "${CORE_VERSION}" --depth 1 "${piholeGitUrl}" "${PI_HOLE_LOCAL_REPO}" #git clone --branch "${CORE_VERSION}" --depth 1 "${piholeGitUrl}" "${PI_HOLE_LOCAL_REPO}"
#git clone --branch "${WEB_VERSION}" --depth 1 "${webInterfaceGitUrl}" "${webInterfaceDir}" #git clone --branch "${WEB_VERSION}" --depth 1 "${webInterfaceGitUrl}" "${webInterfaceDir}"
tmpLog="/tmp/pihole-install.log" # tmpLog="/tmp/pihole-install.log"
installLogLoc="${installLogLoc}" # installLogLoc="${installLogLoc}"
FTLdetect 2>&1 | tee "${tmpLog}" # FTLdetect 2>&1 | tee "${tmpLog}"
installPihole 2>&1 | tee "${tmpLog}" # installPihole 2>&1 | tee "${tmpLog}"
mv "${tmpLog}" / # mv "${tmpLog}" /
fetch_release_metadata() { fetch_release_metadata() {
local directory="$1" local directory="$1"
@ -84,7 +84,7 @@ fetch_release_metadata() {
if [[ $CHECKOUT_BRANCHES == true ]] ; then if [[ $CHECKOUT_BRANCHES == true ]] ; then
ln -s /bin/true /usr/local/bin/service ln -s /bin/true /usr/local/bin/service
ln -s /bin/true /usr/local/bin/update-rc.d ln -s /bin/true /usr/local/bin/update-rc.d
echo "${CORE_VERSION}" | sudo tee /etc/pihole/ftlbranch echo "${CORE_VERSION}" | sudo tee /etc/pihole/ftlbranch
echo y | bash -x pihole checkout core ${CORE_VERSION} echo y | bash -x pihole checkout core ${CORE_VERSION}
echo y | bash -x pihole checkout web ${WEB_VERSION} echo y | bash -x pihole checkout web ${WEB_VERSION}
# echo y | bash -x pihole checkout ftl ${CORE_VERSION} # echo y | bash -x pihole checkout ftl ${CORE_VERSION}