From 6fd24c842fec1d8d5acaa4c60a08e047b3dadec4 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 10 Jun 2020 12:24:52 -0400
Subject: [PATCH] get proper ipa for app store

---
 .github/scripts/ios/deploy-app-store.ps1 | 2 +-
 .github/scripts/ios/export-ipa.ps1       | 9 +++++++--
 src/iOS/Info.plist                       | 2 --
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/scripts/ios/deploy-app-store.ps1 b/.github/scripts/ios/deploy-app-store.ps1
index 69a333974..cd3933b50 100644
--- a/.github/scripts/ios/deploy-app-store.ps1
+++ b/.github/scripts/ios/deploy-app-store.ps1
@@ -1,5 +1,5 @@
 $rootPath = $env:GITHUB_WORKSPACE;
-$ipaPath = "$rootPath/com.8bit.bitwarden.ipa"
+$ipaPath = "$rootPath/Bitwarden.ipa"
 
 xcrun altool --upload-app --type ios --file "$ipaPath" `
     --username "$env:APPLE_ID_USERNAME" --password "$env:APPLE_ID_PASSWORD"
diff --git a/.github/scripts/ios/export-ipa.ps1 b/.github/scripts/ios/export-ipa.ps1
index 1c8baac34..a80e7b41f 100644
--- a/.github/scripts/ios/export-ipa.ps1
+++ b/.github/scripts/ios/export-ipa.ps1
@@ -7,7 +7,12 @@ $rootPath = $env:GITHUB_WORKSPACE;
 $homePath = Resolve-Path "~" | Select-Object -ExpandProperty Path
 
 $exportOptionsPath = "$rootPath/.github/resources/export-options-$method.plist";
-$archivePath = "$homePath/Library/Developer/Xcode/Archives/*/*.xcarchive";
-$exportPath = "$rootPath/com.8bit.bitwarden.ipa"
+$archiveBasePath = "$homePath/Library/Developer/Xcode/Archives/*";
+$archivePath = "$archiveBasePath/*.xcarchive";
+$exportPath = "$archiveBasePath/ipa-export";
+$ipaPath = "$exportPath/Bitwarden.ipa";
+$destIpaPath = "$rootPath/Bitwarden.ipa";
 
 xcodebuild -exportArchive -archivePath $archivePath -exportPath $exportPath -exportOptionsPlist $exportOptionsPath
+
+Copy-Item $ipaPath $destIpaPath
diff --git a/src/iOS/Info.plist b/src/iOS/Info.plist
index 2f6f6b255..93d7af626 100644
--- a/src/iOS/Info.plist
+++ b/src/iOS/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
 	<key>MinimumOSVersion</key>
 	<string>10.0</string>
 	<key>CFBundleDisplayName</key>