Merge pull request #114 from vmstan:3.1.2-dev

3.1.2

CHANGELOG.md

@@ -59,6 +59,15 @@ You can now use a standard Pi-hole install as your primary, or your secondary. Y
 
 <img src="https://raw.githubusercontent.com/vmstan/gravity-sync/master/docs/gs-logo.svg" height="150" width="150" alt="Gravity Sync">
 
+#### 3.1.1
+
+- Corrected an error where Docker exec commands would not run correctly on some distributions.
+
+#### 3.1.2
+
+- Fix variable missing quotes error in configuration screen.
+- Convert all bash files from mix of tabs and spaces to 4 space indentation.
+
 ## 3.0
 
 ### The Breakout Release

VERSION

@@ -1 +1 @@
-3.1.1
+3.1.2

gravity-sync.sh

@@ -3,7 +3,7 @@ SCRIPT_START=$SECONDS
 
 # GRAVITY SYNC BY VMSTAN #####################
 PROGRAM='Gravity Sync'
-VERSION='3.1.1'
+VERSION='3.1.2'
 
 # 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
@@ -157,6 +157,9 @@ case $# in
             sudo)
                 start_gs
             task_sudo ;;
+            info)
+                start_gs
+            task_info ;;
             *)
                 start_gs
             task_invalid ;;

includes/gs-config.sh

@@ -206,7 +206,7 @@ function advanced_config_generate {
     fi
     
         
-	if [ $SKIP_PIHOLE_DIR != "1" ]
+    if [ "$SKIP_PIHOLE_DIR" != "1" ]
     then
         MESSAGE="Local Pi-hole Settings Directory Path? (Leave blank for default '/etc/pihole')"
         echo_need

includes/gs-update.sh

@@ -75,6 +75,26 @@ function show_version {
     echo -e "========================================================"
 }
 
+function show_info() {
+    echo -e "========================================================"
+    echo -e "${YELLOW}Local Pi-hole Settings${NC}"
+    echo -e "Local Pi-hole Type: ${PH_IN_TYPE}"
+    echo -e "Local Pi-hole Config Directory: ${PIHOLE_DIR}"
+    echo -e "Local Pi-hole Binary Directory: ${PIHOLE_BIN}"
+    echo -e "Local Docker Binary Directory: ${DOCKER_BIN}"
+    echo -e "Local File Owner Settings: ${DOCKER_BIN}"
+    echo -e "Local Docker Container Name: ${DOCKER_CON}"
+    echo -e ""
+    echo -e "${YELLOW}Remote Pi-hole Settings${NC}"
+    echo -e "Remote Pi-hole Type: ${RH_IN_TYPE}"
+    echo -e "Remote Pi-hole Config Directory: ${RIHOLE_DIR}"
+    echo -e "Remote Pi-hole Binary Directory: ${RIHOLE_BIN}"
+    echo -e "Remote Docker Binary Directory: ${DOCKER_BIN}"
+    echo -e "Remote File Owner Settings: ${DOCKER_BIN}"
+    echo -e "Remote Docker Container Name: ${DOCKER_CON}"
+    echo -e "========================================================"
+}
+
 ## Devmode Task
 function task_devmode {
     TASKTYPE='DEV'
@@ -145,3 +165,15 @@ function task_version {
     show_version
     exit_nochange
 }
+
+## Info Task
+
+function task_info() {
+    TASKTYPE='INFO'
+    MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
+    echo_good
+    
+    show_info
+    
+    exit_nochange
+}