Changelog: Minor touchups to scripts.

desimaniac · desimaniac · commit 1cb65c7c7af0 · 2019-05-24T03:46:26.000-05:00
diff --git a/scripts/changelog.sh b/scripts/changelog.sh
@@ -19,7 +19,8 @@ readonly CHANGELOG="changelog.txt"
 readonly DATE=$(date +"%Y-%m-%d")
 readonly REPO="https://github.com/cloudbox/cloudbox"
 readonly PREVIOUS_VERSION=$(git describe --abbrev=0 --tags)
-readonly NEXT_VERSION=$(echo $PREVIOUS_VERSION | awk -F. -v OFS=. 'NF==1{print ++$NF}; NF>1{$NF=sprintf("%0*d", length($NF), ($NF+1)); print}')
+readonly NEXT_VERSION=$(echo $PREVIOUS_VERSION \
+  | awk -F. -v OFS=. 'NF==1{print ++$NF}; NF>1{$NF=sprintf("%0*d", length($NF), ($NF+1)); print}')
 
 # Boolean vars
 readonly TRUE=1
diff --git a/scripts/release.sh b/scripts/release.sh
@@ -4,11 +4,10 @@
 # Variables
 ################################
 
-readonly CHANGELOG="changelog.txt"
-readonly DATE=$(date +"%Y-%m-%d")
 readonly REPO="cloudbox/cloudbox"
 readonly TAG=$(git describe --abbrev=0 --tags \
   | awk -F. -v OFS=. 'NF==1{print ++$NF}; NF>1{$NF=sprintf("%0*d", length($NF), ($NF+1)); print}')
+readonly CHANGELOG_SCRIPT="scripts/changelog.sh"
 
 ################################
 # Main
@@ -19,7 +18,7 @@ set -e
 
 NAME="${TAG}"
 
-BODY=$(bash scripts/changelog.sh -s)
+BODY=$(bash "$CHANGELOG_SCRIPT" -s)
 
 payload=$(
   jq --null-input \
@@ -38,9 +37,6 @@ response=$(
        "https://api.github.com/repos/${REPO}/releases"
 )
 
-upload_url="$(echo "$response" | jq -r .upload_url | sed -e "s/{?name,label}//")"
-
-
 # Modifications by desimaniac @ github.com
 #
 # Source:
