From dc9696c5ac102da3cd3bbe5baae21963190cb0ba Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 21:28:22 -0500 Subject: [PATCH 1/3] Different method of updating with developer settings --- .gitignore | 1 + gravity-sync.sh | 61 ++++++++++++++++++++++++++++--------------------- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 6d8781a..410ed35 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ backup/*.last backup/*.backup backup/*.push backup/*.pull +dev \ No newline at end of file diff --git a/gravity-sync.sh b/gravity-sync.sh index 2d10018..a84a87c 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -99,25 +99,33 @@ function update_gs { TASKTYPE='UPDATE' # logs_export # dumps log prior to execution because script stops after successful pull + if [ -f "dev" ] + then + BRANCH='development' + else + BRANCH='master' + fi + MESSAGE="Requires GitHub Installation" echo_info - git reset --hard - git pull + git fetch --all + git reset --hard origin/${BRANCH} exit } ## Developer Branch -function beta_gs { - TASKTYPE='BETA' - # logs_export # dumps log prior to execution because script stops after successful pull - - MESSAGE="Requires GitHub Installation" - echo_info - git reset --hard - git fetch origin - git pull origin development - exit -} +# function beta_gs { +# TASKTYPE='BETA' +# # logs_export # dumps log prior to execution because script stops after successful pull +# +# MESSAGE="Requires GitHub Installation" +# echo_info +# git fetch --all +# git reset --hard origin/development +# # git fetch origin +# # git pull origin development +# exit +# } # Gravity Core Functions ## Pull Function @@ -864,6 +872,8 @@ function list_gs_arguments { echo -e "Setup Options:" echo -e " ${YELLOW}config${NC} Create a new ${CONFIG_FILE} file" echo -e " ${YELLOW}automate${NC} Add scheduled task to run sync" + echo -e " ${YELLOW}update${NC} Use GitHub to update this script to the latest version" + echo -e " ${YELLOW}version${NC} Display your version of ${PROGRAM}" echo -e "" echo -e "Replication Options:" echo -e " ${YELLOW}pull${NC} Sync the ${GRAVITY_FI} database on primary Pi-hole to this server" @@ -871,12 +881,11 @@ function list_gs_arguments { echo -e " ${YELLOW}restore${NC} Restore ${GRAVITY_FI} on this server from previous copy" echo -e " ${YELLOW}compare${NC} Just check for differences between primary and secondary" echo -e "" - echo -e "Update Options:" - echo -e " ${YELLOW}update${NC} Use GitHub to update this script to the latest version" - echo -e " ${YELLOW}beta${NC} Use GitHub to update this script to the latest beta version" - echo -e "" +# echo -e "Update Options:" +# echo -e " ${YELLOW}update${NC} Use GitHub to update this script to the latest version" +# echo -e " ${YELLOW}beta${NC} Use GitHub to update this script to the latest beta version" +# echo -e "" echo -e "Debug Options:" - echo -e " ${YELLOW}version${NC} Display your version of ${PROGRAM}" echo -e " ${YELLOW}logs${NC} Show recent successful replication jobs" echo -e " ${YELLOW}cron${NC} Display output of last crontab execution" echo -e "" @@ -1104,16 +1113,16 @@ case $# in exit_nochange ;; - beta) - TASKTYPE='BETA' - echo_good + # beta) + # TASKTYPE='BETA' + # echo_good - MESSAGE="${TASKTYPE} Requested" - echo_info + # MESSAGE="${TASKTYPE} Requested" + # echo_info - beta_gs - exit_nochange - ;; + # beta_gs + # exit_nochange + # ;; logs) TASKTYPE='LOGS' From 4ec550026bf80a677b65c5c0680afbf05ac6ad77 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 21:38:00 -0500 Subject: [PATCH 2/3] 1.7.2 --- CHANGELOG.md | 16 ++++++++++++---- README.md | 6 +++--- VERSION | 2 +- gravity-sync.sh | 2 +- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e46ba28..7d6d346 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,24 +4,33 @@ ### The Andrew Release **Features** - - Gravity Sync will now manage the `custom.list` file that contains the "Local DNS Records" function within the Pi-hole interface. - If you do not want this feature enabled it can be bypassed by adding a `SKIP_CUSTOM='1'` to your .conf file. - Sync will be trigged during a pull operation if there are changes to either file. **Known Issues** - - No new Star Trek references. #### 1.7.1 - There is a changelog file now. I'm mentioning it in the changelog file. So meta. - `./gravity-sync.sh version` will check for and alert you for new versions. +#### 1.7.2 +This update changes the way that beta/development updates are applied. To continue receving the development branch, create an empty file in the `gravity-sync` folder called `dev` and afterwards the standard `./gravity-sync.sh update` function will apply the correct updates. +``` +cd gravity-sync +touch dev +./gravity-sync.sh update +``` +Delete the `dev` file and update again to revert back to the stable/master branch. + +**Deprecation** +- Removes `beta` function for applying development branch updates. + ## 1.6 ### The Restorative Release **Features** - - New `./gravity-sync.sh restore` function will bring a previous version of the `gravity.db` back from the dead. - Changes way that GS prompts for data input and how confirmation prompts are handled. - Adds ability to override verification of push, restore or config reset, see `.example` file for details. @@ -34,7 +43,6 @@ ### The Automated Release **Features** - - You can now easily deploy the task automation via crontab by running `./gravity-sync.sh automate` which will simply ask how often you'd like to run the script per hour, and then create the entry for you. - If you've already configured an entry for this manually with a prior version, the script should detect this and ask that you manually remove it or edit it via crontab -e. I'm hesitant to delete existing entries here, as it could potentially remove something unrelated to Gravity Sync. diff --git a/README.md b/README.md index 406e00c..b663ada 100644 --- a/README.md +++ b/README.md @@ -45,9 +45,9 @@ Download the latest release from [GitHub](https://github.com/vmstan/gravity-sync ```bash cd ~ -wget https://github.com/vmstan/gravity-sync/archive/v1.7.1.zip -unzip v1.7.1.zip -mv ~/gravity-sync-1.7.1 ~/gravity-sync +wget https://github.com/vmstan/gravity-sync/archive/v1.7.2.zip +unzip v1.7.2.zip +mv ~/gravity-sync-1.7.2 ~/gravity-sync cd gravity-sync ``` diff --git a/VERSION b/VERSION index 081af9a..0a182f2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.1 \ No newline at end of file +1.7.2 \ No newline at end of file diff --git a/gravity-sync.sh b/gravity-sync.sh index a84a87c..f7aaff1 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -2,7 +2,7 @@ # GRAVITY SYNC BY VMSTAN ##################### PROGRAM='Gravity Sync' -VERSION='1.7.1' +VERSION='1.7.2' # Execute from the home folder of the user who owns it (ex: 'cd ~/gravity-sync') # For documentation or downloading updates visit https://github.com/vmstan/gravity-sync From ebab06dcd74986e3001c33fd0888942cdf5a6a6c Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 21:39:01 -0500 Subject: [PATCH 3/3] 1.7.2(1) --- gravity-sync.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index f7aaff1..c27adcd 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -905,7 +905,7 @@ function show_version { MESSAGE="Running Version: ${GREEN}${VERSION}${NC}" echo_info - GITVERSION=$(curl -sf https://raw.githubusercontent.com/vmstan/gravity-sync/development/VERSION) + GITVERSION=$(curl -sf https://raw.githubusercontent.com/vmstan/gravity-sync/master/VERSION) if [ -z "$GITVERSION" ] then MESSAGE="Latest Version: ${RED}Unknown${NC}"