Use jq // alternate operator

check-spelling · Feb 23, 2020 · 6505ab5 · 6505ab5
1 parent 8f4f585
commit 6505ab5
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/unknown-words.sh b/unknown-words.sh
@@ -190,12 +190,9 @@ bullet_words() {
   echo "$1" | perl -pne 's/^(.)/* $1/'
   rm -f "$run_warnings"
   export tokens="$1"
-  base=$(cat $GITHUB_EVENT_PATH | jq -r '.pull_request.base.sha' -M || echo HEAD^)
-  if [ "$base" = "null" ]; then
-    base=$(cat $GITHUB_EVENT_PATH |jq -r '.before' -M)
-  fi
+  base=$(cat $GITHUB_EVENT_PATH | jq -r '.pull_request.base.sha // .before // "HEAD^"' -M)
   if [ "$base" != "HEAD^" ]; then
-    head=$(cat $GITHUB_EVENT_PATH | jq -r '.pull_request.head.sha' -M || echo HEAD^)
+    head=$(cat $GITHUB_EVENT_PATH | jq -r '.pull_request.head.sha' -M)
     if [ "$head" = "null" ]; then
       head=${GITHUB_SHA:-HEAD}
     fi