From b639fdeb15ff4a473713a3b34908fd22b9bd6fd9 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 10 Sep 2019 15:16:56 -0400
Subject: [PATCH] mas switch on copy

---
 scripts/safari-build.ps1 | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/safari-build.ps1 b/scripts/safari-build.ps1
index 11c76b1716..11153f7333 100644
--- a/scripts/safari-build.ps1
+++ b/scripts/safari-build.ps1
@@ -13,10 +13,8 @@ $dir = Split-Path -Parent $MyInvocation.MyCommand.Path;
 $rootDir = $dir + "\..";
 $distDir = $rootDir + "\dist";
 $distSafariDir = $distDir + "\safari";
-$distSafariAppex = $distSafariDir + "\browser\dist\Safari\dmg\build\Release\safari.appex";
-if($mas) {
-  $distSafariAppex = $distSafariDir + "\browser\dist\Safari\mas\build\Release\safari.appex";
-}
+$distSafariAppexDmg = $distSafariDir + "\browser\dist\Safari\dmg\build\Release\safari.appex";
+$distSafariAppexMas = $distSafariDir + "\browser\dist\Safari\mas\build\Release\safari.appex";
 $pluginsAppex = $rootDir + "\PlugIns\safari.appex";
 
 if(Test-Path -Path $distSafariDir) {
@@ -32,12 +30,16 @@ cd $distSafariDir
 git clone git@github.com:bitwarden/browser.git
 cd browser
 
-if (-not ([string]::IsNullOrEmpty($version))) {
+if(-not ([string]::IsNullOrEmpty($version))) {
   $tag = "v" + $version
   git checkout tags/$tag
 }
 
 npm i
 npm run dist:safari
-Copy-Item -Path $distSafariAppex -Destination $pluginsAppex –Recurse
+if($mas) {
+  Copy-Item -Path $distSafariAppexMas -Destination $pluginsAppex –Recurse
+} else {
+  Copy-Item -Path $distSafariAppexDmg -Destination $pluginsAppex –Recurse
+}
 cd $rootDir