From 2376c814608d41acdedc2702ae77f7b1604b899f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Fri, 2 Oct 2020 17:48:34 +0200
Subject: [PATCH] Fix scoop-gen

---
 script/scoop-gen | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/script/scoop-gen b/script/scoop-gen
index e123e1b8245..2e4adf64770 100755
--- a/script/scoop-gen
+++ b/script/scoop-gen
@@ -3,28 +3,29 @@
 set -e
 
 tagname="${1?}"
-version="${tagname#v}"
-urlprefix="https://github.com/cli/cli/releases/download/$tagname/"
 jsonfile="${2?}"
 
 jq_args=(
-  --arg version "$version"
+  --arg version "${tagname#v}"
+  --arg urlprefix "https://github.com/cli/cli/releases/download/$tagname/"
   $(cat | awk '
     /windows_386/ {
-      printf "--arg win32hash \"%s\"\n", $1
-      printf "--arg win32file \"%s\"\n", $2
+      printf "--arg win32hash %s\n", $1
+      printf "--arg win32file %s\n", $2
     }
     /windows_amd64/ {
-      printf "--arg win64hash \"%s\"\n", $1
-      printf "--arg win64file \"%s\"\n", $2
+      printf "--arg win64hash %s\n", $1
+      printf "--arg win64file %s\n", $2
     }
   ')
 )
 
 jq '
   .version = $version |
-  .architecture."32bit".url  = $win32file |
+  .architecture."32bit".url  = $urlprefix + $win32file |
   .architecture."32bit".hash = $win32hash |
-  .architecture."64bit".url  = $win64file |
+  .architecture."64bit".url  = $urlprefix + $win64file |
   .architecture."64bit".hash = $win64hash
 ' "${jq_args[@]}" --indent 4 "$jsonfile" > "$jsonfile"~
+
+mv "$jsonfile"{~,}