From 948643de90abe74823f4ae3757c07d6ec0ba4fcd Mon Sep 17 00:00:00 2001 From: tangobravo14 Date: Thu, 7 Mar 2024 14:33:36 +0000 Subject: [PATCH] added prompt for users to run git pull on their repository --- AmRRON-PAT-GUI.sh | 24 ++++++++++++++++++++++-- AmRRON-Setup-Script.sh | 4 ++-- AmRRON-TriMode-Setup.sh | 21 +++++++++++++++++++++ AmRRON-Vara-setup.sh | 24 +++++++++++++++++++++--- changelogs/CHANGELOG-PAT-GUI.md | 3 ++- changelogs/CHANGELOG-Setup-Script.md | 2 +- changelogs/CHANGELOG-TriMode.md | 2 ++ changelogs/CHANGELOG-Vara-setup.md | 2 ++ 8 files changed, 73 insertions(+), 9 deletions(-) diff --git a/AmRRON-PAT-GUI.sh b/AmRRON-PAT-GUI.sh index 3eb20a6..839fec9 100755 --- a/AmRRON-PAT-GUI.sh +++ b/AmRRON-PAT-GUI.sh @@ -1,9 +1,9 @@ #!/bin/bash ################################################################################ ################################################################################ - ################# AmRRON PAT Setup and Alias Manager v0.5.3 ################## + ################# AmRRON PAT Setup and Alias Manager v0.6 ################## ################# Created by TB-14 ################## - ################# 21 OCT 22 ################## + ################# 07 Mar 24 ################## ################################################################################ ################################################################################ @@ -39,6 +39,25 @@ SOURCE="${BASH_SOURCE[0]}" DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" #echo "$DIR" +function check_repo_version() { + + echo "To ensure your scripts are up to date with current features and fixes, \ +Quit this installer and run the command + +git pull + +in the setup-scripts directory and then relaunch the scripts. If your repo is up to \ +date, click continue." | yad \ +--image=$DIR/images/corps-icon.png \ +--center \ +--text-info \ +--wrap \ +--button="Quit:1" \ +--button="Continue:0" \ +--title "Ensure your scripts are up to date." \ +${r} ${c} + +} function dep_check() { @@ -366,5 +385,6 @@ fi set_screen_size +check_repo_version dep_check skip_setup diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 7227b7d..766639a 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1,9 +1,9 @@ #!/bin/bash ################################################################################ ################################################################################ -######################## AmRRON Setup Script v0.7.5.4 ######################## +######################## AmRRON Setup Script v0.8 ######################## ######################## Created by TB-14 ######################## -######################## 27 Feb 2024 ######################## +######################## 07 Mar 2024 ######################## ################################################################################ ################################################################################ # diff --git a/AmRRON-TriMode-Setup.sh b/AmRRON-TriMode-Setup.sh index 6153365..ea3a923 100755 --- a/AmRRON-TriMode-Setup.sh +++ b/AmRRON-TriMode-Setup.sh @@ -27,6 +27,26 @@ c="--width=${columns}" r="--height=${rows}" } +function check_repo_version() { + + echo "To ensure your scripts are up to date with current features and fixes, \ +Quit this installer and run the command + +git pull + +in the setup-scripts directory and then relaunch the scripts. If your repo is up to \ +date, click continue." | yad \ +--image=$DIR/images/corps-icon.png \ +--center \ +--text-info \ +--wrap \ +--button="Quit:1" \ +--button="Continue:0" \ +--title "Ensure your scripts are up to date." \ +${r} ${c} + +} + function determine_os() { #Deterimine computer type. function noOS_Support() { @@ -724,6 +744,7 @@ ardop_launcher set_screen_size +check_repo_version determine_os info_dialogs easy_button diff --git a/AmRRON-Vara-setup.sh b/AmRRON-Vara-setup.sh index 6dd8540..7631876 100755 --- a/AmRRON-Vara-setup.sh +++ b/AmRRON-Vara-setup.sh @@ -1,9 +1,9 @@ #!/bin/bash ################################################################################ ################################################################################ - ####################### AmRRON Vara Setup v.0.76 ######################### + ####################### AmRRON Vara Setup v.0.8 ######################### ####################### Created by TB-14 ######################### - ####################### 05 Mar 2024 ######################### + ####################### 07 Mar 2024 ######################### ################################################################################ ################################################################################ @@ -77,8 +77,25 @@ SOURCE="${BASH_SOURCE[0]}" DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" #echo "$DIR" -#Set image location +function check_repo_version() { + echo "To ensure your scripts are up to date with current features and fixes, \ +Quit this installer and run the command + +git pull + +in the setup-scripts directory and then relaunch the scripts. If your repo is up to \ +date, click continue." | yad \ +--image=$DIR/images/corps-icon.png \ +--center \ +--text-info \ +--wrap \ +--button="Quit:1" \ +--button="Continue:0" \ +--title "Ensure your scripts are up to date." \ +${r} ${c} + +} # Create a error function to make life easier later on function errors() { @@ -438,6 +455,7 @@ exit 1 set_screen_size +check_repo_version confirm_os primer_menu if [[ $PLAT = Linuxmint ]]; then diff --git a/changelogs/CHANGELOG-PAT-GUI.md b/changelogs/CHANGELOG-PAT-GUI.md index 8862284..f65ea12 100644 --- a/changelogs/CHANGELOG-PAT-GUI.md +++ b/changelogs/CHANGELOG-PAT-GUI.md @@ -1,5 +1,6 @@ # PAT-GUI Changelog - +# Version 0.6 +- Added prompt for running git pull command. # Version 0.5.3 - Changed location of pat config.json diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 167641a..1860bf4 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,4 +1,4 @@ -# Version 0.7.6 +# Version 0.8 - Added checking for script currency. # Version 0.7.5.4 - Removed Electrum install option. No longer supported via this script. diff --git a/changelogs/CHANGELOG-TriMode.md b/changelogs/CHANGELOG-TriMode.md index b56cfcb..fce42b9 100644 --- a/changelogs/CHANGELOG-TriMode.md +++ b/changelogs/CHANGELOG-TriMode.md @@ -1,4 +1,6 @@ # Tri-Mode Setup Changelog +# Version 0.7 +- Added prompt for running git pull command. # Version 0.6.3 - Added Linux Mint version checking for 21.1 / 21.2 / 21.3 diff --git a/changelogs/CHANGELOG-Vara-setup.md b/changelogs/CHANGELOG-Vara-setup.md index 7923356..e3dcdb0 100644 --- a/changelogs/CHANGELOG-Vara-setup.md +++ b/changelogs/CHANGELOG-Vara-setup.md @@ -1,3 +1,5 @@ +# Version 0.8 +- Added prompt for running git pull command. # Version 0.6 - Another edit because download link format changed. # Version 0.5