Update release script.

release.lua

@@ -1,12 +1,12 @@
 #!/usr/bin/lua
-local VERSION = 2
+local VERSION = 4
 -- lua5.2 release script for factorio mods
 -- by [email protected]
--- Requires https://github.com/zserge/luash and https://github.com/whiteinge/ok.sh
+-- Requires https://github.com/zserge/luash, https://github.com/whiteinge/ok.sh, and https://stedolan.github.io/jq/
 -- Remember to set up ~/.netrc
---
+-- https://github.com/folknor/factorio-release-script
 -- LICENSE CC-BY-SA 3.0 https://creativecommons.org/licenses/by-sa/3.0
-
+local userId = "folknor"
 local sh = require("sh")
 local _ = tostring
 local source = _(curl("-s", "https://raw.githubusercontent.com/folknor/factorio-release-script/master/release.lua"))
@@ -25,19 +25,21 @@ end
 
 local oksh = sh.command("ok.sh")
 local function exit(...) io.write(..., "\n") os.exit() end
-
 local maj, min, patch = tonumber((select(1, ...))), tonumber((select(2, ...))), tonumber((select(3, ...)))
 if type(maj) ~= "number" or type(min) ~= "number" or type(patch) ~= "number" then exit("Please provide an additive version number bump, like 0 0 10, 0 1 0, 1 0 2, or 0 0 0 for no bump.") end
-
 local mod = _(cat("info.json"))
 local name = mod:match("\"name\":%s+\"(%S+)\"")
 if type(name) ~= "string" or name:len() < 5 then exit("Could not parse name from info.json.") end
 local oMaj, oMin, oPatch = tonumber(mod:match("\"version\":%s+\"(%d+).%d+.%d+\"")), tonumber(mod:match("\"version\":%s+\"%d+.(%d+).%d+\"")), tonumber(mod:match("\"version\":%s+\"%d+.%d+.(%d+)\""))
 if type(oMaj) ~= "number" or type(oMin) ~= "number" or type(oPatch) ~= "number" then exit("Failed to parse mod version from info.json.") end
 
 local lastTag = _(git("describe", "--tags", "--abbrev=0", "HEAD^"))
-local changes = "body=\"" .. _(git("log", lastTag .. "..HEAD", "--pretty=format:\"* %s\"")) .. "\""
-
+local changes = nil
+if lastTag:len() ~= 0 then
+	changes = "body=\"" .. _(git("log", lastTag .. "..HEAD", "--pretty=format:\"* %s\"")) .. "\""
+else
+	changes = "body=\"" .. _(git("log", "--pretty=format:\"* %s\"")) .. "\""
+end
 local version = "%d.%d.%d"
 if maj ~= 0 or min ~= 0 or patch ~= 0 then
 	version = version:format(oMaj + maj, oMin + min, oPatch + patch)
@@ -53,10 +55,13 @@ local tag = "v" .. version
 git("tag", tag)
 git("push", "origin", tag) -- Commit the tag before we do the release post
 
-if type(changes) == "string" then
-	local repo = _(git("rev-parse", "--show-toplevel")):match("^.*/(%w+)$")
-	oksh("create_release", "folknor", repo, tag, changes)
-end
+local repo = _(git("rev-parse", "--show-toplevel")):match("^.*/([%w%-%_]+)$")
+local id = _(jq(oksh("-j", "create_release", userId, repo, tag, changes), "'.id'"))
 
 local tuple = name .. "_" .. version
-git("archive", "--prefix=" .. tuple .. "/", "--output=" .. tuple .. ".zip", "HEAD")
+local zip = tuple .. ".zip"
+git("archive", "--prefix=" .. tuple .. "/", "--output=" .. zip, "HEAD")
+
+if type(id) == "string" and id:len() ~= 0 then
+	oksh("upload_asset", userId, repo, id, zip, "filename=" .. zip, "mime_type=application/zip")
+end