From cc1e1270e1daabb6b9700792debdecb22b072c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Kr=C3=BCger?= Date: Mon, 19 Sep 2022 16:53:27 +0200 Subject: [PATCH] Determine base branch with 'jq' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The GitHub API response contains the base branch in which the changes should pulled into. This is now extracted with 'jq' from the response. Also some Shellcheck issues were fixed. Signed-off-by: Tim Krüger --- scripts/analysis/getBranchName.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/analysis/getBranchName.sh b/scripts/analysis/getBranchName.sh index 300f864a5..c1fc70c95 100755 --- a/scripts/analysis/getBranchName.sh +++ b/scripts/analysis/getBranchName.sh @@ -1,9 +1,11 @@ #!/bin/bash -# $1: username, $2: password/token, $3: pull request number +# $1: username +# $2: password/token +# $3: pull request number -if [ -z $3 ] ; then - git branch | grep '*' | cut -d' ' -f2 +if [ -z "$3" ] ; then + git branch | grep '\*' | cut -d' ' -f2 else - curl 2>/dev/null -u $1:$2 https://api.github.com/repos/nextcloud/talk-android/pulls/$3 | grep \"ref\": | grep -v master | cut -d"\"" -f4 + curl 2>/dev/null -u "$1":"$2" "https://api.github.com/repos/nextcloud/talk-android/pulls/$3" | jq .base.ref fi