use pr{id} syntax for checked out PRs

This commit is contained in:
frennkie
2020-09-10 21:11:57 +02:00
committed by Robert Habermann
parent f7f7d208d9
commit 33e6be2245

View File

@@ -178,7 +178,7 @@ patch()
newGitHubBranch=$(echo "${newGitHubBranch}" | cut -d " " -f1) newGitHubBranch=$(echo "${newGitHubBranch}" | cut -d " " -f1)
echo "--> " $newGitHubBranch echo "--> " $newGitHubBranch
error="" error=""
source <(sudo -u admin /home/admin/XXsyncScripts.sh ${newGitHubBranch}) source <(sudo -u admin /home/admin/XXsyncScripts.sh -run ${newGitHubBranch})
if [ ${#error} -gt 0 ]; then if [ ${#error} -gt 0 ]; then
whiptail --title "ERROR" --msgbox "${error}" 8 30 whiptail --title "ERROR" --msgbox "${error}" 8 30
fi fi
@@ -195,9 +195,9 @@ patch()
pullRequestID=$(echo "${pullRequestID}" | cut -d " " -f1) pullRequestID=$(echo "${pullRequestID}" | cut -d " " -f1)
echo "--> " $pullRequestID echo "--> " $pullRequestID
cd /home/admin/raspiblitz cd /home/admin/raspiblitz
git fetch origin pull/${pullRequestID}/head:${pullRequestID}pr git fetch origin pull/${pullRequestID}/head:pr${pullRequestID}
error="" error=""
source <(sudo -u admin /home/admin/XXsyncScripts.sh ${pullRequestID}pr) source <(sudo -u admin /home/admin/XXsyncScripts.sh -run pr${pullRequestID})
if [ ${#error} -gt 0 ]; then if [ ${#error} -gt 0 ]; then
whiptail --title "ERROR" --msgbox "${error}" 8 30 whiptail --title "ERROR" --msgbox "${error}" 8 30
fi fi