From b8e28224570b3699e82e97e21da2f7e25a6a92a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Vay=C3=A1?= <guillermo.vaya@mattermost.com>
Date: Tue, 20 Apr 2021 12:20:37 +0200
Subject: [PATCH] Fix msi (#1548)

* fix checking for a tag

* fix ico path

* no need to remove asar.unpack

* fix copy from various sources to same dir
---
 .circleci/config.yml      | 8 ++++----
 scripts/Makefile.ps1      | 4 ----
 scripts/msi_installer.wxs | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index abc41ad3..d73bf4bf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -287,14 +287,14 @@ jobs:
       - run:
           name: "Don't upload if it's not on a tag"
           command: |
-            if [ -z `git tag -l --points-at master` ]; then
+            if [ -z `git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null` ]; then
               circleci-agent step halt
             fi  
       - run:
           name: "Setup files for aws-s3"
           command: |
             mkdir -p ./aws-s3-dist
-            cp ./dist/{macos-release,win-release,linux}/* ./aws-s3-dist
+            cp --backup=numbered ./dist/{macos-release,win-release,linux}/* ./aws-s3-dist
       - aws-s3/copy:
           from: ./aws-s3-dist/
           to: s3://releases.mattermost.com/desktop/$(jq -r .version package.json)/
@@ -324,14 +324,14 @@ jobs:
       - run:
           name: "Don't upload if it's not on a tag"
           command: |
-            if [ -z `git tag -l --points-at master` ]; then
+            if [ -z `git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null` ]; then
               circleci-agent step halt
             fi  
       - run:
           name: "Setup files for ghr"
           command: |
             mkdir -p ./ghr-dist
-            cp ./dist/{macos-release,win-release,linux}/* ./ghr-dist
+            cp --backup=numbered ./dist/{macos-release,win-release,linux}/* ./ghr-dist
       - run:
           name: "Publish Release on GitHub"
           command: |
diff --git a/scripts/Makefile.ps1 b/scripts/Makefile.ps1
index 78a5caa3..9e9f56c2 100644
--- a/scripts/Makefile.ps1
+++ b/scripts/Makefile.ps1
@@ -533,10 +533,6 @@ function Run-BuildElectron {
     Print-Info "Packaging nodejs/electron for Windows (running npm run package:windows)..."
     npm run package:windows
     #npm run package:windows --prefix="$(Get-RootDir)" "$(Get-RootDir)"
-
-    Print-Info "Cleaning build dir..."
-    Remove-Item "release\win-ia32-unpacked\resources\app.asar.unpacked\" -Force -Recurse
-    Remove-Item "release\win-unpacked\resources\app.asar.unpacked\" -Force -Recurse
 }
 
 function Run-BuildForceSignature {
diff --git a/scripts/msi_installer.wxs b/scripts/msi_installer.wxs
index 1f670223..da8d9d06 100644
--- a/scripts/msi_installer.wxs
+++ b/scripts/msi_installer.wxs
@@ -131,7 +131,7 @@
     </InstallExecuteSequence>
     <CustomAction Id="LaunchApp" FileKey="MattermostDesktopEXE" ExeCommand="" Return="asyncNoWait" />
     <CustomAction Id="KillApp" Directory="INSTALLDIR" Return="ignore" ExeCommand="&quot;[SystemFolder]taskkill.exe&quot; /F /IM &quot;Mattermost.exe&quot;" />
-    <Icon Id="Mattermost.ico" SourceFile="../resources/icon.ico" />
+    <Icon Id="Mattermost.ico" SourceFile="../src/assets/icon.ico" />
     <Property Id="ARPPRODUCTICON">Mattermost.ico</Property>
     <Property Id="ARPCONTACT">https://pre-release.mattermost.com</Property>
     <Property Id="ARPHELPLINK">https://docs.mattermost.com/</Property>