diff options
author | Adam Warner <PromoFaux@users.noreply.github.com> | 2016-12-26 02:43:35 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-26 02:43:35 +0300 |
commit | 739aaafa9a7cf90fb0ab58af0f873b7cc8aec1f5 (patch) | |
tree | 2c529709aae5252f931fedd95901fb52ed3cfe03 | |
parent | bfe5506cc19d7bae894df358fc534c4b006169cb (diff) | |
parent | 62d001225a7d9a918ec919261c321e24a6cfb2ce (diff) |
Merge pull request #1041 from pi-hole/developmentv2.10.2
[RELEASE] Pi-Hole Core 2.10.2
-rwxr-xr-x[-rw-r--r--] | advanced/Scripts/update.sh | 26 | ||||
-rwxr-xr-x | advanced/Scripts/webpage.sh | 1 | ||||
-rw-r--r-- | advanced/pihole.cron | 7 |
3 files changed, 22 insertions, 12 deletions
diff --git a/advanced/Scripts/update.sh b/advanced/Scripts/update.sh index 10728cd8..eb6ccd29 100644..100755 --- a/advanced/Scripts/update.sh +++ b/advanced/Scripts/update.sh @@ -22,9 +22,15 @@ readonly PI_HOLE_FILES_DIR="/etc/.pihole" is_repo() { # Use git to check if directory is currently under VCS, return the value local directory="${1}" - - git -C "${directory}" status --short &> /dev/null - return + local curdir + local rc + + curdir="${PWD}" + cd "${directory}" &> /dev/null || return 1 + git status --short &> /dev/null + rc=$? + cd "${curdir}" &> /dev/null || return 1 + return $rc } prep_repo() { @@ -46,16 +52,20 @@ make_repo() { update_repo() { local directory="${1}" - local retVal=0 + local curdir # Pull the latest commits + curdir="${PWD}" + cd "${directory}" &> /dev/null || return 1 # Stash all files not tracked for later retrieval - git -C "${directory}" stash --all --quiet &> /dev/null || ${retVal}=1 + git stash --all --quiet &> /dev/null # Force a clean working directory for cloning - git -C "${directory}" clean --force -d &> /dev/null || ${retVal}=1 + git clean --force -d &> /dev/null # Fetch latest changes and apply - git -C "${directory}" pull --quiet &> /dev/null || ${retVal}=1 - return ${retVal} + git pull --quiet &> /dev/null + cd "${curdir}" &> /dev/null || return 1 + + return } getGitFiles() { diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh index 38e82c14..b6d500cd 100755 --- a/advanced/Scripts/webpage.sh +++ b/advanced/Scripts/webpage.sh @@ -61,6 +61,7 @@ SetWebPassword(){ echo "WEBPASSWORD=${hash}" >> /etc/pihole/setupVars.conf echo "New password set" else + echo "WEBPASSWORD=" >> /etc/pihole/setupVars.conf echo "Password removed" fi diff --git a/advanced/pihole.cron b/advanced/pihole.cron index cb9965f0..8311acfb 100644 --- a/advanced/pihole.cron +++ b/advanced/pihole.cron @@ -13,15 +13,14 @@ # scripts, any changes made to this file will be overwritten when the softare # is updated or re-installed. Please make any changes to the appropriate crontab # or other cron file snippets. -PATH="$PATH:/usr/local/bin/" # Pi-hole: Update the ad sources once a week on Sunday at 01:59 # Download any updates from the adlists -59 1 * * 7 root pihole updateGravity +59 1 * * 7 root PATH="$PATH:/usr/local/bin/" pihole updateGravity # Pi-hole: Update Pi-hole! Uncomment to enable auto update -#30 2 * * 7 root pihole updatePihole +#30 2 * * 7 root PATH="$PATH:/usr/local/bin/" pihole updatePihole # Pi-hole: Flush the log daily at 00:00 so it doesn't get out of control # Stats will be viewable in the Web interface thanks to the cron job above -00 00 * * * root pihole flush +00 00 * * * root PATH="$PATH:/usr/local/bin/" pihole flush |