Prechádzať zdrojové kódy

Determine base branch with 'jq'

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 <t@timkrueger.me>
Tim Krüger 2 rokov pred
rodič
commit
cc1e1270e1
1 zmenil súbory, kde vykonal 6 pridanie a 4 odobranie
  1. 6 4
      scripts/analysis/getBranchName.sh

+ 6 - 4
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