From 18dbad4e8cc54cd318472ae8208ebfad8843ecb8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 27 Feb 2020 17:30:00 +0000
Subject: [PATCH] Revert e0631770b5a2fefb0e238147ebeaee825c8a07ef &
 9ec2407957555214d6c734857f046eeae31b6060

Which were accidentally comitted to master and also completely wrong
as it sets the version to the literal 'develop' which is silly.
---
 scripts/fetch-package.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/scripts/fetch-package.js b/scripts/fetch-package.js
index 3f62f46..1ee43c4 100755
--- a/scripts/fetch-package.js
+++ b/scripts/fetch-package.js
@@ -118,7 +118,7 @@ async function main() {
     let targetVersion;
     let filename;
     let url;
-    let shouldSetPackageVersion = false;
+    let setVersion = false;
 
     while (process.argv.length > 2) {
         switch (process.argv[2]) {
@@ -166,7 +166,7 @@ async function main() {
     } else {
         filename = 'riot-' + targetVersion + '.tar.gz';
         url = PACKAGE_URL_PREFIX + targetVersion + '/' + filename;
-        shouldSetPackageVersion = true;
+        setVersion = true;
     }
 
     const haveGpg = await new Promise((resolve) => {
@@ -279,15 +279,13 @@ async function main() {
     console.log("Pack " + expectedDeployDir + " -> " + ASAR_PATH);
     await asar.createPackage(expectedDeployDir, ASAR_PATH);
 
-    if (shouldSetPackageVersion) {
+    if (setVersion) {
         const semVer = targetVersion.slice(1);
-        console.log("Updating package version to " + semVer);
+        console.log("Updating version to " + semVer);
         await setPackageVersion(semVer);
+        await setDebVersion(semVer);
     }
 
-    console.log("Updating deb version to " + targetVersion);
-    await setDebVersion(targetVersion);
-
     console.log("Done!");
 }