From 5d9491ee1a85cbe353df7c91ec3912abe4ca6f67 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 17:17:53 -0500 Subject: [PATCH 01/17] add changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..0fb664c --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +#Changelog + From 9f5affe4bc70b15a040f6cbb58119938858037ab Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 17:25:20 -0500 Subject: [PATCH 02/17] Version breakout --- CHANGELOG.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fb664c..802bc74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,52 @@ #Changelog +## 1.7 + +## 1.6 + +## 1.5 + +## 1.4 + +### 1.4.3 +### 1.4.2 +### 1.4.1 + +## 1.3 + +### 1.3.4 +### 1.3.3 +### 1.3.2 +### 1.3.1 + +## 1.2 + +### 1.2.5 +### 1.2.4 +### 1.2.3 +### 1.2.2 +### 1.2.1 + +## 1.1 + +### 1.1.6 +### 1.1.5 +### 1.1.4 +### 1.1.3 +### 1.1.2 + +## 1.0 + +Initial release, to [vmstan.com](https://vmstan.com/gravity-sync) + +``` +echo 'Copying gravity.db from HA primary' +rsync -e 'ssh -p 22' ubuntu@192.168.7.5:/etc/pihole/gravity.db /home/pi/gravity-sync +echo 'Replacing gravity.db on HA secondary' +sudo cp /home/pi/gravity-sync/gravity.db /etc/pihole/ echo 'Reloading configuration of HA secondary FTLDNS from new gravity.db' +pihole restartdns reload-lists +echo 'Cleaning up things' +mv /home/pi/gravity-sync/gravity.db /home/pi/gravity- sync/gravity.db.last +``` + +For real, that's it. 7 lines. \ No newline at end of file From 57b12c4830697e6b498cd4ffcab018dea5241910 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 17:37:42 -0500 Subject: [PATCH 03/17] changelog --- CHANGELOG.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 802bc74..ecb8ea6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,28 @@ ## 1.7 +**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.6 +**Features** + +- New ./gravity-sync 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. +- Five new Star Trek references. + +**Bug Fixes** +- New functions add consistency in status output. + ## 1.5 ## 1.4 @@ -29,6 +49,8 @@ ## 1.1 +Moved from Gist. + ### 1.1.6 ### 1.1.5 ### 1.1.4 @@ -37,7 +59,7 @@ ## 1.0 -Initial release, to [vmstan.com](https://vmstan.com/gravity-sync) +Initial release, to Andrew, internal Slack and eventually [vmstan.com](https://vmstan.com/gravity-sync) ``` echo 'Copying gravity.db from HA primary' From ef77acda351975bb1cadf48cc75a7431039652bc Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 17:56:47 -0500 Subject: [PATCH 04/17] Full log --- CHANGELOG.md | 106 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 83 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecb8ea6..8445d7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,10 @@ -#Changelog +# The Changelog ## 1.7 - **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. +- 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** @@ -13,53 +12,114 @@ - No new Star Trek references. ## 1.6 - **Features** -- New ./gravity-sync restore function will bring a previous version of the gravity.db back from the dead. +- New `./gravity-sync 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. +- Adds ability to override verification of push, restore or config reset, see `.example` file for details. - Five new Star Trek references. **Bug Fixes** - New functions add consistency in status output. ## 1.5 +**Features** -## 1.4 +- 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. + +**Bug Fixes** + +- Changes method for pulling development branch updates via the beta function. +- Cleanup of various exit commands. + +## 1.4 +**Features** +- Adds new `./gravity-sync config` feature to simplify deployment! +- Adds variables for SSH settings. +- Rearranges functions, which impacts nothing. +- All new and exciting code comments. +- No new Star Trek references. -### 1.4.3 -### 1.4.2 ### 1.4.1 +- Adds variables for custom log locations to `gravity-sync.conf`, see `.example` file for listing. +### 1.4.2 +- Will prompt to create new `gravity-sync.conf` file when run without an existing configuration. +### 1.4.3 +- Bug fixes around not properly utilizing custom SSH keyfile. ## 1.3 +1.3 should be called 2.0, but I'll resist that temptation -- so many new enhancements! + +**Features** +- GS will now compare remote and local databases and only replicate if it detects a difference. +- Verifies most commands complete before continuing each step to fail more gracefully. +- Additional debugging options such as checking last cronjob output, if configured. +- Much more consistency in how running commands are processed in interactive mode. +- What was once a 10 line bash script is now a 500 line monster (good, bad?) ### 1.3.4 -### 1.3.3 -### 1.3.2 +- Moves backup of local database before initiating remote pull. +- Validates file ownership and permissions before attempting to rewrite. +- Added two Star Trek references. + ### 1.3.1 +- Changes [GOOD] to [DONE] in execution output. +- Better validation of initial SSH connection. +- Support for password based authentication using SSHPASS. + +### 1.3.2 +- MUCH cleaner output, same great features. + +### 1.3.3 +- Corrected Pihole bin path issue that cause automated sync not to reload services. ## 1.2 +- Refactored process to use functions and cleanup process of execution. +- Does not look for permission to update when run. +- Cleanup and expand comments. + +### 1.2.1 +- Improved logging functions. + +### 1.2.2 +- Different style for status updates. + +### 1.2.3 +- Uses a dedicated backup folder for `.backup` and `.last` files. +- Copies db instead of moving to rename and then replacing to be more reliable. +- Even cleaner label status. + +### 1.2.4 +- Changes `~` to `$HOME`. +- Fixes bug that prevented sync from working when run via crontab. ### 1.2.5 -### 1.2.4 -### 1.2.3 -### 1.2.2 -### 1.2.1 +- Push function now does a backup, on the secondary PH, of the primary database, before pushing. ## 1.1 +- Seperated main purpose of script into `pull` argument. +- Allow process to reverse back using `push` argument. -Moved from Gist. +### 1.1.2 +- First release since move from being just a Gist. +- Just relearning how to use GitHub, minor bug fixes. + +### 1.1.3 +- Now includes example an configuration file. + +### 1.1.4 +- Added update script. +- Added version check. + +### 1.1.5 +- Added ability to view logs with `./gravity-sync.sh logs`. ### 1.1.6 -### 1.1.5 -### 1.1.4 -### 1.1.3 -### 1.1.2 +- Code easier to read with proper tabs. ## 1.0 - -Initial release, to Andrew, internal Slack and eventually [vmstan.com](https://vmstan.com/gravity-sync) +Initial release: to Andrew, internal Slack and eventually [vmstan.com](https://vmstan.com/gravity-sync). ``` echo 'Copying gravity.db from HA primary' From 3d0ccb4e84c14c754755bba6464fa8d046e0512d Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 18:03:40 -0500 Subject: [PATCH 05/17] Add VERSION file --- CHANGELOG.md | 4 ++++ VERSION | 1 + 2 files changed, 5 insertions(+) create mode 100644 VERSION diff --git a/CHANGELOG.md b/CHANGELOG.md index 8445d7a..531355e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ - 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 alert for new versions. + ## 1.6 **Features** diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..081af9a --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.7.1 \ No newline at end of file From b813d214920ecda740d54536b4546ab5de90ed79 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 18:07:38 -0500 Subject: [PATCH 06/17] Output version on Git --- gravity-sync.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gravity-sync.sh b/gravity-sync.sh index 0ed3038..70ef759 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -886,6 +886,10 @@ function list_gs_arguments { function show_version { MESSAGE="${PROGRAM} ${VERSION}" echo_info + + GITVERSION=$(curl https://raw.githubusercontent.com/vmstan/gravity-sync/development/VERSION) + MESSAGE="Latest Version: ${GITVERSION}" + echo_info } # Task Stack From c51753d3882263695a81fd2b6007344bd9029154 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 18:09:48 -0500 Subject: [PATCH 07/17] Updated show version --- gravity-sync.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 70ef759..372beea 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -884,10 +884,13 @@ function list_gs_arguments { # Output Version function show_version { - MESSAGE="${PROGRAM} ${VERSION}" + MESSAGE="${PROGRAM} by @vmstan" + echo_info + + MESSAGE="Current Version: ${VERSION}" echo_info - GITVERSION=$(curl https://raw.githubusercontent.com/vmstan/gravity-sync/development/VERSION) + GITVERSION=$(curl -s https://raw.githubusercontent.com/vmstan/gravity-sync/development/VERSION) MESSAGE="Latest Version: ${GITVERSION}" echo_info } From 46784159e3a67bdb8a32095264369869a3d81e30 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 18:20:33 -0500 Subject: [PATCH 08/17] master version check --- gravity-sync.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 372beea..19bd4aa 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -887,10 +887,10 @@ function show_version { MESSAGE="${PROGRAM} by @vmstan" echo_info - MESSAGE="Current Version: ${VERSION}" + MESSAGE="Running Version: ${VERSION}" echo_info - GITVERSION=$(curl -s https://raw.githubusercontent.com/vmstan/gravity-sync/development/VERSION) + GITVERSION=$(curl -s https://raw.githubusercontent.com/vmstan/gravity-sync/master/VERSION) MESSAGE="Latest Version: ${GITVERSION}" echo_info } From f4886298f0a0734704e2e26748196aaddccb6a82 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 20:11:04 -0500 Subject: [PATCH 09/17] Times are a changin --- CHANGELOG.md | 61 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 531355e..7fd4d26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # The Changelog ## 1.7 +### 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. @@ -11,11 +13,13 @@ - No new Star Trek references. -### 1.7.1 +#### 1.7.1 - There is a changelog file now. I'm mentioning it in the changelog file. So meta. - `./gravity-sync.sh version` will alert for new versions. ## 1.6 +### The Restorative Release + **Features** - New `./gravity-sync restore` function will bring a previous version of the `gravity.db` back from the dead. @@ -27,6 +31,8 @@ - New functions add consistency in status output. ## 1.5 +### 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. @@ -37,7 +43,9 @@ - Changes method for pulling development branch updates via the beta function. - Cleanup of various exit commands. -## 1.4 +## 1.4 +### The Configuration Release + **Features** - Adds new `./gravity-sync config` feature to simplify deployment! - Adds variables for SSH settings. @@ -45,7 +53,7 @@ - All new and exciting code comments. - No new Star Trek references. -### 1.4.1 +#### 1.4.1 - Adds variables for custom log locations to `gravity-sync.conf`, see `.example` file for listing. ### 1.4.2 - Will prompt to create new `gravity-sync.conf` file when run without an existing configuration. @@ -53,77 +61,82 @@ - Bug fixes around not properly utilizing custom SSH keyfile. ## 1.3 +### The Comparison Release 1.3 should be called 2.0, but I'll resist that temptation -- so many new enhancements! **Features** -- GS will now compare remote and local databases and only replicate if it detects a difference. +- Gravity Sync will now compare remote and local databases and only replicate if it detects a difference. - Verifies most commands complete before continuing each step to fail more gracefully. - Additional debugging options such as checking last cronjob output, if configured. - Much more consistency in how running commands are processed in interactive mode. -- What was once a 10 line bash script is now a 500 line monster (good, bad?) -### 1.3.4 -- Moves backup of local database before initiating remote pull. -- Validates file ownership and permissions before attempting to rewrite. -- Added two Star Trek references. - -### 1.3.1 +#### 1.3.1 - Changes [GOOD] to [DONE] in execution output. - Better validation of initial SSH connection. - Support for password based authentication using SSHPASS. -### 1.3.2 +#### 1.3.2 - MUCH cleaner output, same great features. -### 1.3.3 +#### 1.3.3 - Corrected Pihole bin path issue that cause automated sync not to reload services. +#### 1.3.4 +- Moves backup of local database before initiating remote pull. +- Validates file ownership and permissions before attempting to rewrite. +- Added two Star Trek references. + ## 1.2 +### The Functional Release - Refactored process to use functions and cleanup process of execution. - Does not look for permission to update when run. - Cleanup and expand comments. -### 1.2.1 +#### 1.2.1 - Improved logging functions. -### 1.2.2 +#### 1.2.2 - Different style for status updates. -### 1.2.3 +#### 1.2.3 - Uses a dedicated backup folder for `.backup` and `.last` files. - Copies db instead of moving to rename and then replacing to be more reliable. - Even cleaner label status. -### 1.2.4 +#### 1.2.4 - Changes `~` to `$HOME`. - Fixes bug that prevented sync from working when run via crontab. -### 1.2.5 +#### 1.2.5 - Push function now does a backup, on the secondary PH, of the primary database, before pushing. ## 1.1 +### The Pushy Release + - Seperated main purpose of script into `pull` argument. - Allow process to reverse back using `push` argument. -### 1.1.2 +#### 1.1.2 - First release since move from being just a Gist. - Just relearning how to use GitHub, minor bug fixes. -### 1.1.3 +#### 1.1.3 - Now includes example an configuration file. -### 1.1.4 +#### 1.1.4 - Added update script. - Added version check. -### 1.1.5 +#### 1.1.5 - Added ability to view logs with `./gravity-sync.sh logs`. -### 1.1.6 +#### 1.1.6 - Code easier to read with proper tabs. ## 1.0 -Initial release: to Andrew, internal Slack and eventually [vmstan.com](https://vmstan.com/gravity-sync). +### The Initial Release** + +No version control, variables or anything fancy. It only worked if everything was exactly perfect. ``` echo 'Copying gravity.db from HA primary' From a6de8d21f065fb5efd40b2ffc7cf5c5dcbde7bb3 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 20:33:10 -0500 Subject: [PATCH 10/17] typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fd4d26..fa1fca4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,7 @@ **Features** -- New `./gravity-sync restore` function will bring a previous version of the `gravity.db` back from the dead. +- 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. - Five new Star Trek references. From 0b3653fe2deafc6482948407d6dd1bc1ade80eb1 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 20:53:28 -0500 Subject: [PATCH 11/17] Failure detection for curl --- gravity-sync.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 19bd4aa..e4c8769 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -890,8 +890,13 @@ function show_version { MESSAGE="Running Version: ${VERSION}" echo_info - GITVERSION=$(curl -s https://raw.githubusercontent.com/vmstan/gravity-sync/master/VERSION) - MESSAGE="Latest Version: ${GITVERSION}" + GITVERSION=$(curl -sf https://raw.githubusercontent.com/vmstan/gravity-sync/master/VERSION) + if [ -z "$GITVERSION" ] + then + MESSAGE="Latest Version: Unable to Check" + else + MESSAGE="Latest Version: ${GITVERSION}" + fi echo_info } From 7b92b90580b74c95550b47a09d9979cf46a0f72d Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 20:54:09 -0500 Subject: [PATCH 12/17] Testing failure conditions --- gravity-sync.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index e4c8769..7896384 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -890,10 +890,10 @@ function show_version { MESSAGE="Running Version: ${VERSION}" echo_info - GITVERSION=$(curl -sf https://raw.githubusercontent.com/vmstan/gravity-sync/master/VERSION) + GITVERSION=$(curl -sf https://raw.githubusercontent.com/vmstan/gravity-sync/development/VERSION) if [ -z "$GITVERSION" ] then - MESSAGE="Latest Version: Unable to Check" + MESSAGE="Latest Version: Unknown" else MESSAGE="Latest Version: ${GITVERSION}" fi From 55d443f37bcc52d6ec4920d8df347efc5eaa017c Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 21:01:52 -0500 Subject: [PATCH 13/17] Colors for version IDs --- gravity-sync.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 7896384..9e6f979 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -882,20 +882,26 @@ function list_gs_arguments { exit_nochange } -# Output Version +# Version Control +## Show Version function show_version { MESSAGE="${PROGRAM} by @vmstan" echo_info - MESSAGE="Running Version: ${VERSION}" + MESSAGE="Running Version: ${GREEN}${VERSION}${NC}" echo_info GITVERSION=$(curl -sf https://raw.githubusercontent.com/vmstan/gravity-sync/development/VERSION) if [ -z "$GITVERSION" ] then - MESSAGE="Latest Version: Unknown" + MESSAGE="Latest Version: ${RED}Unknown${NC}" else - MESSAGE="Latest Version: ${GITVERSION}" + if [ "$GITVERSION" != "$VERSION" ] + then + MESSAGE="Upgrade Available: ${PURPLE}${GITVERSION}${NC}" + else + MESSAGE="Latest Version: ${GREEN}${GITVERSION}${NC}" + fi fi echo_info } From 8d1789613de85f2729b0f66c0182c0f122f66b50 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 21:04:11 -0500 Subject: [PATCH 14/17] Add website --- gravity-sync.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 9e6f979..e58cba9 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -885,7 +885,10 @@ function list_gs_arguments { # Version Control ## Show Version function show_version { - MESSAGE="${PROGRAM} by @vmstan" + MESSAGE="${PROGRAM} by ${CYAN}@vmstan${NC}" + echo_info + + MESSAGE="${BLUE}https://github.com/vmstan/gravity-sync${NC}" echo_info MESSAGE="Running Version: ${GREEN}${VERSION}${NC}" From e4ee005953926d6700a12323e6a83d5d7d5e28e4 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 21:06:07 -0500 Subject: [PATCH 15/17] Border --- gravity-sync.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index e58cba9..e25d4c1 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -885,6 +885,7 @@ function list_gs_arguments { # Version Control ## Show Version function show_version { + echo -e "========================================================" MESSAGE="${PROGRAM} by ${CYAN}@vmstan${NC}" echo_info @@ -901,12 +902,13 @@ function show_version { else if [ "$GITVERSION" != "$VERSION" ] then - MESSAGE="Upgrade Available: ${PURPLE}${GITVERSION}${NC}" + MESSAGE="Upgrade Available: ${YELLOW}${GITVERSION}${NC}" else MESSAGE="Latest Version: ${GREEN}${GITVERSION}${NC}" fi fi echo_info + echo -e "========================================================" } # Task Stack From 69cda511aa01d226fca5c38a96079927e904119b Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 21:09:37 -0500 Subject: [PATCH 16/17] Make it BOLD --- gravity-sync.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index e25d4c1..439c6e9 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -57,6 +57,7 @@ CYAN='\033[0;96m' YELLOW='\033[0;93m' PURPLE='\033[0;95m' BLUE='\033[0;94m' +BOLD='\033[1m' NC='\033[0m' # Message Codes @@ -886,7 +887,7 @@ function list_gs_arguments { ## Show Version function show_version { echo -e "========================================================" - MESSAGE="${PROGRAM} by ${CYAN}@vmstan${NC}" + MESSAGE="${BOLD}${PROGRAM}${NC} by ${CYAN}@vmstan${NC}" echo_info MESSAGE="${BLUE}https://github.com/vmstan/gravity-sync${NC}" From 9c95116ee71b4ac8f9d47a368d835f94c84e1a12 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 29 May 2020 21:13:52 -0500 Subject: [PATCH 17/17] 1.7.1 --- CHANGELOG.md | 2 +- README.md | 6 +++--- gravity-sync.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa1fca4..e46ba28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ #### 1.7.1 - There is a changelog file now. I'm mentioning it in the changelog file. So meta. -- `./gravity-sync.sh version` will alert for new versions. +- `./gravity-sync.sh version` will check for and alert you for new versions. ## 1.6 ### The Restorative Release diff --git a/README.md b/README.md index c4975e2..406e00c 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.0.zip -unzip v1.7.0.zip -mv ~/gravity-sync-1.7.0 ~/gravity-sync +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 cd gravity-sync ``` diff --git a/gravity-sync.sh b/gravity-sync.sh index 439c6e9..2d10018 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -2,7 +2,7 @@ # GRAVITY SYNC BY VMSTAN ##################### PROGRAM='Gravity Sync' -VERSION='1.7.0' +VERSION='1.7.1' # 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