diff --git a/VERSION b/VERSION index a0cd9f0..50e47c8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.0 \ No newline at end of file +3.1.1 \ No newline at end of file diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index e325c7c..b08d9c0 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -59,6 +59,10 @@ You can now use a standard Pi-hole install as your primary, or your secondary. Y Gravity Sync +#### 3.1.1 + +- Fixes issue where Docker based Pi-hole restarts may not complete. [#109](https://github.com/vmstan/gravity-sync/issues/109) + ## 3.0 ### The Breakout Release diff --git a/gravity-sync.sh b/gravity-sync.sh index 22ef576..8585459 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -3,7 +3,7 @@ SCRIPT_START=$SECONDS # GRAVITY SYNC BY VMSTAN ##################### PROGRAM='Gravity Sync' -VERSION='3.1.0' +VERSION='3.1.1' # For documentation or downloading updates visit https://github.com/vmstan/gravity-sync # Requires Pi-Hole 5.x or higher already be installed, for help visit https://pi-hole.net diff --git a/includes/gs-core.sh b/includes/gs-core.sh index de9766a..6abad37 100644 --- a/includes/gs-core.sh +++ b/includes/gs-core.sh @@ -51,7 +51,7 @@ function ph_type { PH_EXEC="${PIHOLE_BIN}" elif [ "$PH_IN_TYPE" == "docker" ] then - PH_EXEC="${DOCKER_BIN} exec -it ${DOCKER_CON} pihole" + PH_EXEC="${DOCKER_BIN} exec ${DOCKER_CON} pihole" fi if [ "$RH_IN_TYPE" == "default" ] @@ -59,7 +59,7 @@ function ph_type { RH_EXEC="${RIHOLE_BIN}" elif [ "$RH_IN_TYPE" == "docker" ] then - RH_EXEC="${ROCKER_BIN} exec -it ${DOCKER_CON} pihole" + RH_EXEC="${ROCKER_BIN} exec ${DOCKER_CON} pihole" fi } diff --git a/prep/gs-install.sh b/prep/gs-install.sh index 9916435..0d53fce 100644 --- a/prep/gs-install.sh +++ b/prep/gs-install.sh @@ -187,6 +187,7 @@ fi if [ -d gravity-sync ] then echo -e "[${RED}✗${NC}] Folder gravity-sync Already Exists" + echo -e "[${PURPLE}!${NC}] ${PURPLE}Use './gravity-sync.sh update' to Update Instead${NC}" CROSSCOUNT=$((CROSSCOUNT+1)) fi