From 31132aa4ecdb8d5c17d45401075abcf2d5ca35e7 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 16 Feb 2020 10:53:49 +0000 Subject: [PATCH] Wild experimentations to see what circle does... --- install.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) mode change 100755 => 100644 install.sh diff --git a/install.sh b/install.sh old mode 100755 new mode 100644 index 3f2214a..2372792 --- a/install.sh +++ b/install.sh @@ -63,11 +63,11 @@ webInterfaceDir="${webInterfaceDir}" #git clone --branch "${CORE_VERSION}" --depth 1 "${piholeGitUrl}" "${PI_HOLE_LOCAL_REPO}" #git clone --branch "${WEB_VERSION}" --depth 1 "${webInterfaceGitUrl}" "${webInterfaceDir}" -tmpLog="/tmp/pihole-install.log" -installLogLoc="${installLogLoc}" -FTLdetect 2>&1 | tee "${tmpLog}" -installPihole 2>&1 | tee "${tmpLog}" -mv "${tmpLog}" / +# tmpLog="/tmp/pihole-install.log" +# installLogLoc="${installLogLoc}" +# FTLdetect 2>&1 | tee "${tmpLog}" +# installPihole 2>&1 | tee "${tmpLog}" +# mv "${tmpLog}" / fetch_release_metadata() { local directory="$1" @@ -84,7 +84,7 @@ fetch_release_metadata() { if [[ $CHECKOUT_BRANCHES == true ]] ; then ln -s /bin/true /usr/local/bin/service 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 web ${WEB_VERSION} # echo y | bash -x pihole checkout ftl ${CORE_VERSION}