From 35741bb69937708d473a5a9a5dfc078c08795454 Mon Sep 17 00:00:00 2001 From: rootzoll Date: Sun, 26 Apr 2020 21:54:24 +0200 Subject: [PATCH] #1138 connect GUI with fuction --- home.admin/99updateMenu.sh | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/home.admin/99updateMenu.sh b/home.admin/99updateMenu.sh index a5e44c7e3..c9140ebb2 100644 --- a/home.admin/99updateMenu.sh +++ b/home.admin/99updateMenu.sh @@ -146,7 +146,11 @@ patch() exitstatus=$? if [ $exitstatus = 0 ]; then newGitHubUser=$(echo "${newGitHubUser}" | cut -d " " -f1) - echo "--> " $newGitHubUser + echo "--> " ${newGitHubUser} + source <(sudo -u admin /home/admin/XXsyncScripts.sh ${activeBranch} ${newGitHubUser}) + if [ ${#error} -gt 0 ]; then + whiptail --title "ERROR" --msgbox "${error}" 8 30 + fi fi echo "PRESS ENTER to return to PATCH MENU." read key @@ -160,6 +164,10 @@ patch() if [ $exitstatus = 0 ]; then newGitHubBranch=$(echo "${newGitHubBranch}" | cut -d " " -f1) echo "--> " $newGitHubBranch + source <(sudo -u admin /home/admin/XXsyncScripts.sh ${$newGitHubBranch}) + if [ ${#error} -gt 0 ]; then + whiptail --title "ERROR" --msgbox "${error}" 8 30 + fi fi echo "PRESS ENTER to return to PATCH MENU." read key @@ -190,20 +198,4 @@ case $CHOICE in LND) lnd ;; -esac - - -# get latest release version from GitHub -sudo curl -s -X GET https://raw.githubusercontent.com/rootzoll/raspiblitz/master/home.admin/_version.info > /home/admin/.version.tmp -gitHubVersionMain=$(cut -d"=" -f2 /home/admin/.version.tmp | cut -d'"' -f2 | cut -d"." -f1 | egrep "^[0-9]") -gitHubVersionSub=$(cut -d"=" -f2 /home/admin/.version.tmp | cut -d'"' -f2 | cut -d"." -f2 | egrep "^[0-9]") -sudo shred /home/admin/.version.tmp -sudo rm /home/admin/.version.tmp 2>/dev/null - -# check valid version info -if [ ${#gitHubVersionMain} -eq 0 ] || [ ${#gitHubVersionSub} -eq 0 ]; then - echo "FAIL: Was not able to get latest release Version from GitHub." - echo "PRESS ENTER to continue." - read key - exit 1 -fi \ No newline at end of file +esac \ No newline at end of file