3.2.5 (#140)

Co-authored-by: Michael Stanclift <vmstan@mstanclift-a03.vmware.com>

CHANGELOG.md

@@ -42,6 +42,11 @@ The `./gravity-sync.sh restore` process completely revamped:
 
 - Changes script startup and shutdown text format.
 
+#### 3.2.5
+
+- Correct error where Docker based installs would fail to restart if Docker exec commands required sudo privileges.
+- Correct error where setup script would prompt twice for Local/Remote DNSMASQ directories when using Docker.
+
 ## 3.1
 
 ### The Container Release

VERSION

@@ -1 +1 @@
-3.2.4
+3.2.5

gravity-sync.sh

@@ -3,7 +3,7 @@ SCRIPT_START=$SECONDS
 
 # GRAVITY SYNC BY VMSTAN #####################
 PROGRAM='Gravity Sync'
-VERSION='3.2.4'
+VERSION='3.2.5'
 
 # 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

includes/gs-config.sh

@@ -161,7 +161,7 @@ function advanced_config_generate {
             echo_stat
             sed -i "/# DNSMAQ_DIR=''/c\DNSMAQ_DIR='${INPUT_DNSMAQ_DIR}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
             error_validate
-            SKIP_DNSMAQ_DIR="1"
+            SKIP_DNSMASQ_DIR="1"
         else
             MESSAGE="This setting is required!"
             echo_warn
@@ -226,7 +226,7 @@ function advanced_config_generate {
             echo_stat
             sed -i "/# RNSMAQ_DIR=''/c\RNSMAQ_DIR='${INPUT_RNSMAQ_DIR}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
             error_validate
-            SKIP_RNSMAQ_DIR="1"
+            SKIP_RNSMASQ_DIR="1"
         else
             MESSAGE="This setting is required!"
             echo_warn

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 ${DOCKER_CON} pihole"
+        PH_EXEC="sudo ${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 ${ROCKER_CON} pihole"
+        RH_EXEC="sudo ${ROCKER_BIN} exec ${ROCKER_CON} pihole"
     fi
 }