From d94741b22365101a398289585e688da7ff7f3cd0 Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Wed, 28 Feb 2018 22:17:31 +0900
Subject: [PATCH] Tweak artifact name

---
 electron-builder.json   |  4 +++-
 package.json            |  2 +-
 scripts/cp_artifacts.sh | 18 +++++++-----------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/electron-builder.json b/electron-builder.json
index 665ec8d8..36b74321 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -1,5 +1,6 @@
 {
   "appId": "com.mattermost.desktop",
+  "artifactName": "${name}-${version}-${os}-${arch}.${ext}",
   "directories": {
     "buildResources": "resources",
     "app": "src",
@@ -59,7 +60,8 @@
     ]
   },
   "squirrelWindows": {
-    "iconUrl": "file://resources/icon.ico"
+    "iconUrl": "file://resources/icon.ico",
+    "artifactName": "${name}-setup-${version}-${arch}.${ext}"
   },
   "win": {
     "target": [
diff --git a/package.json b/package.json
index 40308652..bb42772e 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "test": "npm-run-all test:* lint:*",
     "test:app": "cross-env NODE_ENV=production npm run build && mocha -r babel-register --reporter mocha-circleci-reporter --recursive test/specs",
     "package:all": "cross-env NODE_ENV=production npm-run-all check-build-config package:windows package:mac package:linux",
-    "package:windows": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --win --x64 --ia32 --config.extraMetadata.name=mattermost --publish=never && npm run manipulate-windows-zip",
+    "package:windows": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --win --x64 --ia32 --config.extraMetadata.name=mattermost --publish=never",
     "package:mac": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --mac --publish=never",
     "package:linux": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --linux --x64 --ia32 --config.extraMetadata.name=mattermost-desktop --publish=never",
     "manipulate-windows-zip": "node scripts/manipulate_windows_zip.js",
diff --git a/scripts/cp_artifacts.sh b/scripts/cp_artifacts.sh
index 24e3a33c..46eca102 100644
--- a/scripts/cp_artifacts.sh
+++ b/scripts/cp_artifacts.sh
@@ -5,14 +5,10 @@ VERSION=`cat package.json | jq -r '.version'`
 SRC=$1
 DEST=$2
 
-cp "${SRC}/Mattermost-${VERSION}-win.zip" "${DEST}/mattermost-desktop-${VERSION}-win64.zip"
-cp "${SRC}/Mattermost-${VERSION}-ia32-win.zip" "${DEST}/mattermost-desktop-${VERSION}-win32.zip"
-cp "${SRC}/squirrel-windows/Mattermost Setup ${VERSION}.exe" "${DEST}/mattermost-setup-${VERSION}-win64.exe"
-cp "${SRC}/squirrel-windows-ia32/Mattermost Setup ${VERSION}.exe" "${DEST}/mattermost-setup-${VERSION}-win32.exe"
-
-cp "${SRC}/Mattermost-${VERSION}-mac.zip" "${DEST}/mattermost-desktop-${VERSION}-mac.zip"
-
-cp "${SRC}/mattermost-desktop-${VERSION}.tar.gz" "${DEST}/mattermost-desktop-${VERSION}-linux-x64.tar.gz"
-cp "${SRC}/mattermost-desktop-${VERSION}-ia32.tar.gz" "${DEST}/mattermost-desktop-${VERSION}-linux-ia32.tar.gz"
-cp "${SRC}/mattermost-desktop_${VERSION}_amd64.deb" "${DEST}/mattermost-desktop-${VERSION}-linux-x64.deb"
-cp "${SRC}/mattermost-desktop_${VERSION}_i386.deb" "${DEST}/mattermost-desktop-${VERSION}-linux-i386.deb"
+cp "${SRC}/mattermost-${VERSION}-win-ia32.zip" "${DEST}/mattermost-desktop-${VERSION}-win-ia32.zip"
+cp "${SRC}/mattermost-${VERSION}-win-x64.zip" "${DEST}/mattermost-desktop-${VERSION}-win-x64.zip"
+cp "${SRC}/squirrel-windows/mattermost-setup-${VERSION}.exe" "${DEST}/mattermost-setup-${VERSION}-x64.exe"
+cp "${SRC}"/squirrel-windows-ia32/*.exe "${DEST}/"
+cp "${SRC}"/mattermost-desktop-*.zip "${DEST}/"
+cp "${SRC}"/*.tar.gz "${DEST}/"
+cp "${SRC}"/*.deb "${DEST}/"