Mirrored_Repos/gravity-sync
1
0
Fork 0
mirror of https://github.com/vmstan/gravity-sync.git synced 2024-08-30 18:22:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

3.2.5 (#140)

Browse Source 
Co-authored-by: Michael Stanclift <vmstan@mstanclift-a03.vmware.com>
This commit is contained in:
Michael Stanclift 2021-02-02 13:23:29 -06:00 committed by GitHub
parent d0d2ae97d2
commit 13dfc7d2d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -42,6 +42,11 @@ The `./gravity-sync.sh restore` process completely revamped:
- Changes script startup and shutdown text format. - 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 ## 3.1
### The Container Release ### The Container Release

2
VERSION
View File

@ -1 +1 @@
3.2.4 3.2.5

2
gravity-sync.sh
View File

@ -3,7 +3,7 @@ SCRIPT_START=$SECONDS
# GRAVITY SYNC BY VMSTAN ##################### # GRAVITY SYNC BY VMSTAN #####################
PROGRAM='Gravity Sync' PROGRAM='Gravity Sync'
VERSION='3.2.4' VERSION='3.2.5'
# For documentation or downloading updates visit https://github.com/vmstan/gravity-sync # 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 # Requires Pi-Hole 5.x or higher already be installed, for help visit https://pi-hole.net

4
includes/gs-config.sh
View File

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

4
includes/gs-core.sh
View File

@ -51,7 +51,7 @@ function ph_type {
PH_EXEC="${PIHOLE_BIN}" PH_EXEC="${PIHOLE_BIN}"
elif [ "$PH_IN_TYPE" == "docker" ] elif [ "$PH_IN_TYPE" == "docker" ]
then then
PH_EXEC="${DOCKER_BIN} exec ${DOCKER_CON} pihole" PH_EXEC="sudo ${DOCKER_BIN} exec ${DOCKER_CON} pihole"
fi fi
if [ "$RH_IN_TYPE" == "default" ] if [ "$RH_IN_TYPE" == "default" ]
@ -59,7 +59,7 @@ function ph_type {
RH_EXEC="${RIHOLE_BIN}" RH_EXEC="${RIHOLE_BIN}"
elif [ "$RH_IN_TYPE" == "docker" ] elif [ "$RH_IN_TYPE" == "docker" ]
then then
RH_EXEC="${ROCKER_BIN} exec ${ROCKER_CON} pihole" RH_EXEC="sudo ${ROCKER_BIN} exec ${ROCKER_CON} pihole"
fi fi
} }