From 25c8036a97552617a65ca1b954ad6ed160fa9d01 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Sat, 2 Mar 2019 19:55:22 +0000
Subject: [PATCH] Group installers by version

---
 installers/create-appx.js    | 2 +-
 installers/create-deb-arm.js | 3 ++-
 installers/create-deb-x64.js | 3 ++-
 installers/create-exe.js     | 4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/installers/create-appx.js b/installers/create-appx.js
index 3ac6ddea..bfa50e20 100644
--- a/installers/create-appx.js
+++ b/installers/create-appx.js
@@ -5,7 +5,7 @@ const package = require('../package.json');
 convertToWindowsStore({
    containerVirtualization: false,
    inputDirectory: path.join(__dirname, '../release-builds/openflexure-ev-win32-x64'),
-   outputDirectory: path.join(__dirname, '../release-builds/installers'),
+   outputDirectory: path.join(__dirname, '../release-builds/installers', package.version),
    assets: path.join(__dirname, '/appx/assets'),
    identityName: '60425J.T.Collins.OpenFlexureeV',
    packageExecutable: 'app/openflexure-ev.exe',
diff --git a/installers/create-deb-arm.js b/installers/create-deb-arm.js
index 24afeeb1..24fef018 100644
--- a/installers/create-deb-arm.js
+++ b/installers/create-deb-arm.js
@@ -1,9 +1,10 @@
 const installer = require('electron-installer-debian')
 const path = require('path')
+const package = require('../package.json');
 
 const options = {
   src: path.join(__dirname, '../release-builds/openflexure-ev-linux-armv7l/'),
-  dest: path.join(__dirname, '../release-builds/installers'),
+  dest: path.join(__dirname, '../release-builds/installers', package.version),
   arch: 'armhf',
   icon: path.join(__dirname, '../icons/png/1024x1024.png'),
   categories: [
diff --git a/installers/create-deb-x64.js b/installers/create-deb-x64.js
index dfef925d..2ebc69c7 100644
--- a/installers/create-deb-x64.js
+++ b/installers/create-deb-x64.js
@@ -1,9 +1,10 @@
 const installer = require('electron-installer-debian')
 const path = require('path')
+const package = require('../package.json');
 
 const options = {
   src: path.join(__dirname, '../release-builds/openflexure-ev-linux-x64/'),
-  dest: path.join(__dirname, '../release-builds/installers'),
+  dest: path.join(__dirname, '../release-builds/installers', package.version),
   arch: 'amd64',
   icon: path.join(__dirname, '../icons/png/1024x1024.png'),
   categories: [
diff --git a/installers/create-exe.js b/installers/create-exe.js
index 42001ab9..e65dba44 100644
--- a/installers/create-exe.js
+++ b/installers/create-exe.js
@@ -1,5 +1,6 @@
 const createWindowsInstaller = require('electron-winstaller').createWindowsInstaller
 const path = require('path')
+const package = require('../package.json');
 
 getInstallerConfig()
   .then(createWindowsInstaller)
@@ -12,10 +13,11 @@ function getInstallerConfig () {
   console.log('creating windows installer')
 
   return Promise.resolve({
+    setupExe: `${package.name}_${package.version}`,
     appDirectory: path.join(__dirname, '../release-builds/openflexure-ev-win32-x64'),
     authors: 'OpenFlexure',
     noMsi: true,
-    outputDirectory: path.join(__dirname, '../release-builds/installers'),
+    outputDirectory: path.join(__dirname, '../release-builds/installers', package.version),
     exe: 'openflexure-ev.exe',
     setupExe: 'OpenFlexureEvInstaller.exe',
     setupIcon: path.join(__dirname, '../icons/win/icon.ico'),