From 369ae5aa7103b17a19559a8cd9066705379d0896 Mon Sep 17 00:00:00 2001
From: Kingdon Barrett <kingdon@weave.works>
Date: Mon, 23 Jan 2023 13:33:46 -0500
Subject: [PATCH] Quote tested values in fluxcd/flux GitHub Action

Fix an issue with improperly quoted variables created by #3474

Also, curl should fail with an error code if the download results in
404 not found

* + (x3) Update action/action.yml
* for consistent format

Co-authored-by: Steven E. Harris <seh@panix.com>
Signed-off-by: Kingdon Barrett <kingdon@weave.works>
---
 action/action.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/action/action.yml b/action/action.yml
index f92686a9..ee15c7df 100644
--- a/action/action.yml
+++ b/action/action.yml
@@ -28,23 +28,23 @@ runs:
         VERSION=${{ inputs.version }}
         TOKEN=${{ inputs.token }}
 
-        if [ -n $TOKEN ]; then
-          TOKEN=(-H "Authorization: token $TOKEN")
+        if [ -n "${TOKEN}" ]; then
+          TOKEN=(-H "Authorization: token ${TOKEN}")
         fi
 
-        if [ -z $VERSION ]; then
+        if [ -z "${VERSION}" ]; then
           VERSION=$(curl https://api.github.com/repos/fluxcd/flux2/releases/latest -sL "${TOKEN[@]}" | grep tag_name | sed -E 's/.*"([^"]+)".*/\1/' | cut -c 2-)
         fi
 
         BIN_URL="https://github.com/fluxcd/flux2/releases/download/v${VERSION}/flux_${VERSION}_linux_${ARCH}.tar.gz"
-        curl -sL ${BIN_URL} -o /tmp/flux.tar.gz
+        curl --silent --fail --location "${BIN_URL}" --output /tmp/flux.tar.gz
         mkdir -p /tmp/flux
         tar -C /tmp/flux/ -zxvf /tmp/flux.tar.gz
     - name: "Copy Flux binary to execute location"
       shell: bash
       run: |
         BINDIR=${{ inputs.bindir }}
-        if [ -z $BINDIR ]; then
+        if [ -z "${BINDIR}" ]; then
           sudo cp /tmp/flux/flux /usr/local/bin
         else
           cp /tmp/flux/flux "${BINDIR}"