From 0066feb0aebcb205a457407b2ee2036e3aeaa222 Mon Sep 17 00:00:00 2001
From: Mark Green <mark@pavedroad.io>
Date: Mon, 5 Oct 2020 09:30:06 -0700
Subject: [PATCH 1/4] Improve code for ease of maintenance

---
 releases/github-api.sh | 130 ++++++++++++++++++++---------------------
 1 file changed, 64 insertions(+), 66 deletions(-)

diff --git a/releases/github-api.sh b/releases/github-api.sh
index d7f9842..82e50ea 100755
--- a/releases/github-api.sh
+++ b/releases/github-api.sh
@@ -63,7 +63,7 @@ show_item() {
     if [ "${verbose}" == "true" ] ; then
         echo $response | jq "."
     else
-        echo $response | jq -r ".$field"
+        echo $response | jq -r ".$field" 2> /dev/null
     fi
 }
 
@@ -72,13 +72,13 @@ show_array() {
         if [ "${verbose}" == "true" ] ; then
             echo $response | jq ".[0]"
         else
-            echo $response | jq -r ".[0].$field"
+            echo $response | jq -r ".[0].$field" 2> /dev/null
         fi
     else
         if [ "${verbose}" == "true" ] ; then
             echo $response | jq "."
         else
-            echo $response | jq -r ".[].$field"
+            echo $response | jq -r ".[].$field" 2> /dev/null
         fi
     fi
 }
@@ -182,58 +182,48 @@ read_assets_id() {
 }
 
 read_asset_file_id() {
-    if [ -z "$file" ]; then
-        echo Error: read_asset_file_id: File must be specified
+    if [ -z "$asset_file" ]; then
+        echo Error: read_asset_file_id: Must specify asset_file
         return 1
     fi
     response=$(curl -sH "$github_auth" $github_assets)
-    response=$(echo $response | jq --arg f "$file" '.[] | select(.name == $f)')
+    response=$(echo $response | jq --arg f "$asset_file" '.[] | select(.name == $f)')
     field=id show_item
 }
 
 identify_asset() {
     [ "$identify" == "false" ] && return 0
-    if [ -z "$file" ] && [ -z "$asset_id" ]; then
-        echo Error: identify_asset: File or asset_id must be specified
+    if [ -z "$asset_file" ] && [ -z "$asset_id" ]; then
+        echo Error: identify_asset: Must specify asset_file or asset_id
         return 1
     fi
 
     if [ -z "$asset_id" ]; then
         local my_asset_id=$(verbose=false read_asset_file_id)
         if [ -z $my_asset_id ] || [ "$my_asset_id" == "null" ]; then
-            echo Error: identify_asset: File is not an asset: $file
+            echo Error: identify_asset: File is not an asset: $asset_file
             return 1
         fi
         asset_id=$my_asset_id
     fi
 
-    local my_file=$(verbose=false identify=false read_asset)
-    if [ "$my_file" == "null" ]; then
-        echo Error: identify_asset: asset_id is not valid
-        return 1
-    fi
-    if [ -z "$file" ]; then
-        file=$my_file
+    if [ -z "$asset_file" ]; then
+        asset_file=$asset_id_file
     fi
-    asset_file=$my_file
 }
 
 create_asset() {
-    if [ -z "$file" ]; then
-        echo Error: create_asset: File must be specified
-        return 1
-    fi
-    if [ ! -f "$file" ]; then
-        echo Error: create_asset: Asset file does not exist: $file
+    if [ -z "$asset_file" ]; then
+        echo Error: create_asset: Must specify asset_file
         return 1
     fi
     local my_asset_id=$(verbose=false read_asset_file_id)
     if [ ! -z "$my_asset_id" ] ; then
-        echo Error: create_asset: Asset file already exists: $file
+        echo Error: create_asset: Asset file already exists: $asset_file
         return 1
     fi
     local type="Content-Type: application/octet-stream"
-    response=$(curl --data-binary @"$file" -sH "$github_auth" -H "$type" $github_asset)
+    response=$(curl --data-binary @"$asset_file" -sH "$github_auth" -H "$type" $github_asset)
     field=name show_item
     field=id show_item
 }
@@ -241,8 +231,8 @@ create_asset() {
 read_asset() {
     identify_asset
     [ $? -ne 0 ] && return 1
-    if [ "$identify" == "true" ] && [ "$asset_file" != "$file" ]; then
-        echo Error: read_asset: $asset_file does not match option file: $file
+    if [ "$identify" == "true" ] && [ "$asset_id_file" != "$asset_file" ]; then
+        echo Error: read_asset: $asset_id_file does not match option file: $asset_file
         return 1
     fi
 
@@ -254,34 +244,30 @@ read_asset() {
 update_asset() {
     identify_asset
     [ $? -ne 0 ] && return 1
-    if [ ! -f "$file" ]; then
-        echo Error: update_asset: File does not exist: $file
-        return 1
-    fi
-    if [ "$asset_file" == "$file" ]; then
-        echo Updating file: $file
+    if [ "$asset_id_file" == "$asset_file" ]; then
+        echo Updating file: $asset_file
     else
         local my_asset_id=$(verbose=false read_asset_file_id)
         if [ -z "$my_asset_id" ] ; then
-            echo Replacing file: $asset_file with: $file
+            echo Replacing file: $asset_id_file with: $asset_file
         else
-            echo Error: update_asset: Asset file already exists: $file
+            echo Error: update_asset: Asset file already exists: $asset_file
             return 1
         fi
     fi
 
     github_asset_id="$github_rels/assets/$asset_id"
-    identify=false asset_file="$file" delete_asset
+    identify=false asset_id_file="$asset_file" delete_asset
 
-    github_asset="$github_upl_rels/$release_id/assets?name=$file"
+    github_asset="$github_upl_rels/$release_id/assets?name=$asset_file"
     identify=false create_asset
 }
 
 delete_asset() {
     identify_asset
     [ $? -ne 0 ] && return 1
-    if [ "$identify" == "true" ] && [ "$asset_file" != "$file" ]; then
-        echo Error: delete_asset: $asset_file does not match option file: $file
+    if [ "$identify" == "true" ] && [ "$asset_id_file" != "$asset_file" ]; then
+        echo Error: delete_asset: $asset_id_file does not match option file: $asset_file
         return 1
     fi
 
@@ -308,10 +294,6 @@ err_message() {
 branch="master"
 draft=false
 prerel=false
-github_url="https://github.com/"
-github_ssh="git@github.com:"
-github_api="https://api.github.com"
-github_upl="https://uploads.github.com"
 
 # get options
 while getopts ab:c:df:F:hi:I:lm:npr:st:vw opt; do
@@ -320,7 +302,7 @@ while getopts ab:c:df:F:hi:I:lm:npr:st:vw opt; do
         b) branch="$OPTARG";;
         c) command="$OPTARG";;
         d) draft=true;;
-        f) file="$OPTARG";;
+        f) asset_file="$OPTARG";;
         F) notes_file="$OPTARG";;
         i) release_id="$OPTARG";;
         h) usage;;
@@ -339,14 +321,6 @@ while getopts ab:c:df:F:hi:I:lm:npr:st:vw opt; do
     esac
 done
 
-if [ ! -z $notes_file ]; then
-    if [ ! -f "$notes_file" ]; then
-        echo Error: Notes file does not exist: $notes_file
-        exit 1
-    fi
-    message=$(sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/\\r\\n/g' $notes_file)
-fi
-
 if [ ! -z $command ]; then
     case ${command} in
         create|read|update|delete)
@@ -357,31 +331,27 @@ if [ ! -z $command ]; then
             fi
             ;;
         *)
-            echo Error: Command $command is invalid
+            echo Error: Invalid command: $command
             echo command option must be create, read, update, or delete
-            exit 1 ;;
+            exit 1
+            ;;
     esac
 fi
 
-if [ ! -z $asset_id ]; then
-    message asset_id = $asset_id
-fi
-
-if [ ! -z $file ]; then
-    message file = $file
-fi
+github_https_url="https://github.com/"
+github_ssh_url="git@github.com:"
 
 if [ -z $repo ]; then
     # check remote repo url
     remote_url=$(git config --get remote.origin.url)
     if [ -z $remote_url ]; then
-        echo "Must supply repo if not in a git repository"
+        echo "Must specify repo if not in a git repository"
         exit 1
     fi
-    if [[ "$remote_url" =~ ^git* ]] ; then
-        prefix=$github_ssh
+    if [[ "$remote_url" =~ ^$github_https_url* ]] ; then
+        prefix=$github_https_url
     else
-        prefix=$github_url
+        prefix=$github_ssh_url
     fi
     repo=$(echo "$remote_url" | sed -e "s#$prefix##" -e 's/.git$//')
     message current repo = $repo
@@ -395,6 +365,8 @@ else
     message option branch = $branch
 fi
 
+github_api="https://api.github.com"
+github_upl="https://uploads.github.com"
 github_repo="$github_api/repos/$repo"
 github_rels="$github_repo/releases"
 github_latest="$github_repo/releases/latest"
@@ -441,7 +413,7 @@ else
 
     github_release_id="$github_repo/releases/$release_id"
     github_assets="$github_repo/releases/$release_id/assets"
-    github_asset="$github_upl_rels/$release_id/assets?name=$file"
+    github_asset="$github_upl_rels/$release_id/assets?name=$asset_file"
 
     release=$(verbose=false read_rel_id)
     if [ "$release" == "null" ]; then
@@ -449,6 +421,32 @@ else
     fi
 fi
 
+if [ ! -z $asset_id ]; then
+    asset_id_file=$(verbose=false identify=false read_asset)
+    if [ "$asset_id_file" == "null" ]; then
+        echo Error: identify_asset: Invalid asset_id: $asset_id
+        exit 1
+    fi
+    message option asset_id = $asset_id
+fi
+
+if [ ! -z $asset_file ]; then
+    if [ ! -f "$asset_file" ]; then
+        echo Error: Asset file not found: $asset_file
+        exit 1
+    fi
+    message option asset_file = $asset_file
+fi
+
+if [ ! -z $notes_file ]; then
+    if [ ! -f "$notes_file" ]; then
+        echo Error: Notes file not found: $notes_file
+        exit 1
+    fi
+    message option notes_file = $notes_file
+    message=$(sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/\\r\\n/g' $notes_file)
+fi
+
 if [ "${dryrun}" == "true" ] ; then
     echo Exiting dry run
     exit 0

From 228375dc5ef599f3f7c3fe2ef627559ef954148a Mon Sep 17 00:00:00 2001
From: Mark Green <mark@pavedroad.io>
Date: Sun, 11 Oct 2020 10:38:16 -0700
Subject: [PATCH 2/4] Add download of source & assets, fix option checks

---
 releases/github-api.sh      | 79 +++++++++++++++++++++++++++++--------
 releases/github-assets.sh   |  2 +-
 releases/github-download.sh | 47 ++++++++++++++++++++++
 releases/github-release.sh  |  2 +-
 4 files changed, 111 insertions(+), 19 deletions(-)
 create mode 100755 releases/github-download.sh

diff --git a/releases/github-api.sh b/releases/github-api.sh
index 82e50ea..4d44026 100755
--- a/releases/github-api.sh
+++ b/releases/github-api.sh
@@ -3,6 +3,9 @@
 # Thus no #!/usr/bin/env bash
 # In order to not spawn another shell
 
+tarball=tgz
+zipball=zip
+
 usage() {
 cat << EOF
 Usage: $(basename $0) [<option> ... <option value> ...]
@@ -21,16 +24,21 @@ Valid options:
 -m <message>
 -n dryrun set
 -p prerelease set
+-q quite set
 -r <repo>
--s silent set
+-s <source_type>
 -t <tag>
+-u url_only set
 -v verbose set
 -w warning set
-Valid command arguments:
+Valid commands:
 -c create
 -c read
 -c update
 -c delete
+Valid source_types:
+-s $tarball
+-s $zipball
 EOF
 exit 1
 }
@@ -188,20 +196,22 @@ read_asset_file_id() {
     fi
     response=$(curl -sH "$github_auth" $github_assets)
     response=$(echo $response | jq --arg f "$asset_file" '.[] | select(.name == $f)')
-    field=id show_item
+    if [ "$response" != "" ] ; then
+        field=id show_item
+    fi
 }
 
 identify_asset() {
     [ "$identify" == "false" ] && return 0
     if [ -z "$asset_file" ] && [ -z "$asset_id" ]; then
-        echo Error: identify_asset: Must specify asset_file or asset_id
+        echo Error: Must specify asset_file or asset_id
         return 1
     fi
 
     if [ -z "$asset_id" ]; then
         local my_asset_id=$(verbose=false read_asset_file_id)
-        if [ -z $my_asset_id ] || [ "$my_asset_id" == "null" ]; then
-            echo Error: identify_asset: File is not an asset: $asset_file
+        if [ "$my_asset_id" == "" ] || [ "$my_asset_id" == "null" ]; then
+            echo Error: Invalid asset_file for release $tag: $asset_file
             return 1
         fi
         asset_id=$my_asset_id
@@ -219,7 +229,7 @@ create_asset() {
     fi
     local my_asset_id=$(verbose=false read_asset_file_id)
     if [ ! -z "$my_asset_id" ] ; then
-        echo Error: create_asset: Asset file already exists: $asset_file
+        echo Error: create_asset: asset_file already exists: $asset_file
         return 1
     fi
     local type="Content-Type: application/octet-stream"
@@ -251,7 +261,7 @@ update_asset() {
         if [ -z "$my_asset_id" ] ; then
             echo Replacing file: $asset_id_file with: $asset_file
         else
-            echo Error: update_asset: Asset file already exists: $asset_file
+            echo Error: update_asset: asset_file already exists: $asset_file
             return 1
         fi
     fi
@@ -275,14 +285,37 @@ delete_asset() {
     response=$(curl -X "DELETE" -sH "$github_auth" $github_asset_id)
 }
 
+read_asset_url() {
+    response=$(verbose=true read_asset)
+    if [ $? -ne 0 ]; then
+        echo $response
+        return 1
+    fi
+    field=browser_download_url verbose=false show_item
+}
+
+read_source_url() {
+    response=$(verbose=true read_release)
+    if [ $? -ne 0 ]; then
+        echo $response
+        return 1
+    fi
+
+    if [ "$source_type" = "$tarball" ]; then
+        field=tarball_url verbose=false show_item
+    else
+        field=zipball_url verbose=false show_item
+    fi
+}
+
 message() {
-    [ "$silent" == "true" ] && return
+    [ "$quiet" == "true" ] && return
     echo $*
 }
 
 err_message() {
     if [ "$warning" == "true" ]; then
-        if [ "$silent" != "true" ]; then
+        if [ "$quiet" != "true" ]; then
             echo Warning: $*
         fi
     else
@@ -296,7 +329,7 @@ draft=false
 prerel=false
 
 # get options
-while getopts ab:c:df:F:hi:I:lm:npr:st:vw opt; do
+while getopts ab:c:df:F:hi:I:lm:npqr:s:t:uvw opt; do
     case ${opt} in
         a) asset="true";;
         b) branch="$OPTARG";;
@@ -311,9 +344,11 @@ while getopts ab:c:df:F:hi:I:lm:npr:st:vw opt; do
         m) message="$OPTARG";;
         n) dryrun="true";;
         p) prerel=true;;
+        q) quiet="true";;
         r) repo="$OPTARG";;
-        s) silent="true";;
+        s) source_type="$OPTARG";;
         t) tag="$OPTARG";;
+        u) url_only="true";;
         v) verbose="true";;
         w) warning=true;;
         :) usage;;
@@ -422,17 +457,19 @@ else
 fi
 
 if [ ! -z $asset_id ]; then
-    asset_id_file=$(verbose=false identify=false read_asset)
-    if [ "$asset_id_file" == "null" ]; then
-        echo Error: identify_asset: Invalid asset_id: $asset_id
+    response=$(curl -sH "$github_auth" $github_assets)
+    response=$(echo $response | jq --arg f $asset_id '.[] | select(.id == ($f|tonumber))')
+    if [ "$response" == "" ]; then
+        echo Error: Invalid asset_id for release $tag: $asset_id
         exit 1
     fi
     message option asset_id = $asset_id
 fi
 
 if [ ! -z $asset_file ]; then
-    if [ ! -f "$asset_file" ]; then
-        echo Error: Asset file not found: $asset_file
+    if [[ "$asset" == "true" && ( "$command" == "create" ||
+        "$command" == "update" ) && ! -f "$asset_file" ]]; then
+        echo Error: asset_file not found: $asset_file
         exit 1
     fi
     message option asset_file = $asset_file
@@ -447,6 +484,14 @@ if [ ! -z $notes_file ]; then
     message=$(sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/\\r\\n/g' $notes_file)
 fi
 
+if [ ! -z $source_type ]; then
+    if [ "$source_type" != "$tarball" ] && [ "$source_type" != "$zipball" ]; then
+        echo Error: Source type must be $tarball or $zipball
+        exit 1
+    fi
+    message option source_type = $source_type
+fi
+
 if [ "${dryrun}" == "true" ] ; then
     echo Exiting dry run
     exit 0
diff --git a/releases/github-assets.sh b/releases/github-assets.sh
index 4a3eb38..403b1fe 100755
--- a/releases/github-assets.sh
+++ b/releases/github-assets.sh
@@ -4,7 +4,7 @@ asset="true"
 
 source github-api.sh
 
-if [ "$silent" != "true" ]; then
+if [ "$quiet" != "true" ]; then
     echo; echo Uploaded assets:
     read_assets
 
diff --git a/releases/github-download.sh b/releases/github-download.sh
new file mode 100755
index 0000000..6d6af44
--- /dev/null
+++ b/releases/github-download.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+asset="true"
+
+source github-api.sh
+
+# Download source tarball or zipball with option -s tgz or -s zip
+if [ ! -z $source_type ]; then
+    source_url=$(read_source_url)
+    if [ $? -ne 0 ]; then
+        echo $source_url
+        exit 1
+    fi
+
+    if [ "$url_only" == "true" ]; then
+        # Just print URL if option -u is set
+        echo $source_url
+    else
+        file_name=$(basename $repo)-$tag.$source_type
+        echo Downloading $file_name
+        curl -sLo $file_name $source_url
+    fi
+    exit
+fi
+
+# Otherwise download file based on asset name or asset ID
+asset_url=$(read_asset_url)
+if [ $? -ne 0 ]; then
+    echo $asset_url
+    exit 1
+fi
+
+if [ "$url_only" == "true" ]; then
+    # Just print URL if option -u is set
+    echo $asset_url
+else
+    if [ -z $asset_file ]; then
+        asset_file=$(verbose=false identify=false read_asset)
+    fi
+    file_name=${asset_file%.*}-$tag
+    extension=${asset_file##*.}
+    if [ $extension != "" ]; then
+        file_name=${file_name}.${extension}
+    fi
+    echo Downloading $file_name
+    curl -sLo $file_name $asset_url
+fi
diff --git a/releases/github-release.sh b/releases/github-release.sh
index 1962b2d..ec69239 100755
--- a/releases/github-release.sh
+++ b/releases/github-release.sh
@@ -4,7 +4,7 @@ asset="false"
 
 source github-api.sh
 
-if [ "$silent" != "true" ]; then
+if [ "$quiet" != "true" ]; then
     echo; echo Release tags:
     latest=false read_tags
 

From abc5e06ce10cf100c2142d0097d2dce2f7383dd2 Mon Sep 17 00:00:00 2001
From: Mark Green <mark@pavedroad.io>
Date: Sun, 11 Oct 2020 10:45:37 -0700
Subject: [PATCH 3/4] Clean up asset_id & asset_file consistency checks

---
 releases/github-api.sh | 75 +++++++++++++++++++++++-------------------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/releases/github-api.sh b/releases/github-api.sh
index 4d44026..22ba669 100755
--- a/releases/github-api.sh
+++ b/releases/github-api.sh
@@ -24,7 +24,7 @@ Valid options:
 -m <message>
 -n dryrun set
 -p prerelease set
--q quite set
+-q quiet set
 -r <repo>
 -s <source_type>
 -t <tag>
@@ -201,6 +201,18 @@ read_asset_file_id() {
     fi
 }
 
+read_asset_id_file() {
+    if [ -z "$asset_id" ]; then
+        echo Error: read_asset_id_file: Must specify asset_id
+        return 1
+    fi
+    response=$(curl -sH "$github_auth" $github_assets)
+    response=$(echo $response | jq --arg f $asset_id '.[] | select(.id == ($f|tonumber))')
+    if [ "$response" != "" ] ; then
+        field=name show_item
+    fi
+}
+
 identify_asset() {
     [ "$identify" == "false" ] && return 0
     if [ -z "$asset_file" ] && [ -z "$asset_id" ]; then
@@ -209,16 +221,18 @@ identify_asset() {
     fi
 
     if [ -z "$asset_id" ]; then
-        local my_asset_id=$(verbose=false read_asset_file_id)
-        if [ "$my_asset_id" == "" ] || [ "$my_asset_id" == "null" ]; then
+        if [ "$asset_file_id" == "" ]; then
             echo Error: Invalid asset_file for release $tag: $asset_file
             return 1
         fi
-        asset_id=$my_asset_id
+        asset_id=$asset_file_id
     fi
 
     if [ -z "$asset_file" ]; then
         asset_file=$asset_id_file
+    elif [ ! -z "$asset_id_file" ] && [ "$asset_id_file" != "$asset_file" ]; then
+        echo Error: asset_file: $asset_file must match asset_id file: $asset_id_file
+        return 1
     fi
 }
 
@@ -227,11 +241,17 @@ create_asset() {
         echo Error: create_asset: Must specify asset_file
         return 1
     fi
-    local my_asset_id=$(verbose=false read_asset_file_id)
-    if [ ! -z "$my_asset_id" ] ; then
-        echo Error: create_asset: asset_file already exists: $asset_file
+    if [ ! -f "$asset_file" ]; then
+        echo Error: create_asset: asset_file not found: $asset_file
         return 1
     fi
+    if [ "$asset_file_id" != "" ] ; then
+        echo Error: create_asset: asset_file already created: $asset_file
+        return 1
+    fi
+    if [ "$asset_id" != "" ] ; then
+        echo Warning: create_asset: asset_id ignored: $asset_id
+    fi
     local type="Content-Type: application/octet-stream"
     response=$(curl --data-binary @"$asset_file" -sH "$github_auth" -H "$type" $github_asset)
     field=name show_item
@@ -241,10 +261,6 @@ create_asset() {
 read_asset() {
     identify_asset
     [ $? -ne 0 ] && return 1
-    if [ "$identify" == "true" ] && [ "$asset_id_file" != "$asset_file" ]; then
-        echo Error: read_asset: $asset_id_file does not match option file: $asset_file
-        return 1
-    fi
 
     github_asset_id="$github_rels/assets/$asset_id"
     response=$(curl -sH "$github_auth" $github_asset_id)
@@ -254,20 +270,13 @@ read_asset() {
 update_asset() {
     identify_asset
     [ $? -ne 0 ] && return 1
-    if [ "$asset_id_file" == "$asset_file" ]; then
-        echo Updating file: $asset_file
-    else
-        local my_asset_id=$(verbose=false read_asset_file_id)
-        if [ -z "$my_asset_id" ] ; then
-            echo Replacing file: $asset_id_file with: $asset_file
-        else
-            echo Error: update_asset: asset_file already exists: $asset_file
-            return 1
-        fi
+    if [ ! -f "$asset_file" ]; then
+        echo Error: update_asset: asset_file not found: $asset_file
+        return 1
     fi
 
     github_asset_id="$github_rels/assets/$asset_id"
-    identify=false asset_id_file="$asset_file" delete_asset
+    identify=false delete_asset
 
     github_asset="$github_upl_rels/$release_id/assets?name=$asset_file"
     identify=false create_asset
@@ -276,10 +285,6 @@ update_asset() {
 delete_asset() {
     identify_asset
     [ $? -ne 0 ] && return 1
-    if [ "$identify" == "true" ] && [ "$asset_id_file" != "$asset_file" ]; then
-        echo Error: delete_asset: $asset_id_file does not match option file: $asset_file
-        return 1
-    fi
 
     github_asset_id="$github_rels/assets/$asset_id"
     response=$(curl -X "DELETE" -sH "$github_auth" $github_asset_id)
@@ -457,22 +462,24 @@ else
 fi
 
 if [ ! -z $asset_id ]; then
-    response=$(curl -sH "$github_auth" $github_assets)
-    response=$(echo $response | jq --arg f $asset_id '.[] | select(.id == ($f|tonumber))')
-    if [ "$response" == "" ]; then
+    # If asset_id in release then get asset_id_file
+    # Note: asset_id must exist, cannot be created
+    asset_id_file=$(read_asset_id_file)
+    if [ "$asset_id_file" == "" ]; then
         echo Error: Invalid asset_id for release $tag: $asset_id
         exit 1
     fi
     message option asset_id = $asset_id
+    message asset_id file = $asset_id_file
 fi
 
 if [ ! -z $asset_file ]; then
-    if [[ "$asset" == "true" && ( "$command" == "create" ||
-        "$command" == "update" ) && ! -f "$asset_file" ]]; then
-        echo Error: asset_file not found: $asset_file
-        exit 1
-    fi
+    # If asset_file in release then get asset_file_id
+    asset_file_id=$(read_asset_file_id)
     message option asset_file = $asset_file
+    if [ "$asset_file_id" != "" ]; then
+        message asset_file id = $asset_file_id
+    fi
 fi
 
 if [ ! -z $notes_file ]; then

From 93eac783108174d9516bd929a7e63cab6044e15c Mon Sep 17 00:00:00 2001
From: Mark Green <mark@pavedroad.io>
Date: Fri, 23 Oct 2020 09:10:14 -0700
Subject: [PATCH 4/4] Set branch only to create release, default current then
 master

---
 releases/github-api.sh | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/releases/github-api.sh b/releases/github-api.sh
index 22ba669..de6528c 100755
--- a/releases/github-api.sh
+++ b/releases/github-api.sh
@@ -329,7 +329,6 @@ err_message() {
     fi
 }
 
-branch="master"
 draft=false
 prerel=false
 
@@ -399,12 +398,6 @@ else
     message option repo = $repo
 fi
 
-if [ "$branch" == "master" ]; then
-    message default branch = $branch
-else
-    message option branch = $branch
-fi
-
 github_api="https://api.github.com"
 github_upl="https://uploads.github.com"
 github_repo="$github_api/repos/$repo"
@@ -433,6 +426,19 @@ if [ "$command" == "create" ] && [ "$asset" != "true" ]; then
     if [ ! -z $release_id ]; then
         echo Warning: Ignoring release_id when creating release
     fi
+    # branch is required only when creating release
+    if [ -z $branch ]; then
+        # try for repo branch
+        branch=$(git rev-parse --abbrev-ref HEAD)
+        if [ $? -eq 0 ]; then
+            message current branch = $branch
+        else
+            branch="master"
+            message default branch = $branch
+        fi
+    else
+        message option branch = $branch
+    fi
 else
     if [ -z $release_id ]; then
         release_id=$(verbose=false read_rel_tag_id)
@@ -455,10 +461,12 @@ else
     github_assets="$github_repo/releases/$release_id/assets"
     github_asset="$github_upl_rels/$release_id/assets?name=$asset_file"
 
-    release=$(verbose=false read_rel_id)
-    if [ "$release" == "null" ]; then
+    response=$(verbose=true read_rel_id)
+    if [ "$response" == "null" ]; then
         err_message Invalid release_id: $release_id
     fi
+    branch=$(echo $response | jq -r ".target_commitish")
+    message release branch = $branch
 fi
 
 if [ ! -z $asset_id ]; then