From 844b375e7d6af74223017392c697f917526e1e40 Mon Sep 17 00:00:00 2001
From: Reuben Morais <reuben.morais@gmail.com>
Date: Wed, 22 Jul 2020 10:23:35 +0200
Subject: [PATCH] Address review comments

---
 taskcluster/ios-package.sh    | 14 ++++++++------
 taskcluster/tc-build-utils.sh |  7 +++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/taskcluster/ios-package.sh b/taskcluster/ios-package.sh
index 21f59de1..16cc9f96 100755
--- a/taskcluster/ios-package.sh
+++ b/taskcluster/ios-package.sh
@@ -16,13 +16,15 @@ package_libdeepspeech_as_zip "libdeepspeech.zip"
 
 case $arch in
 "--x86_64")
-  ${TAR} -cf - \
-         -C ${DS_ROOT_TASK}/DeepSpeech/ds/native_client/swift/DerivedData/Build/Products/Release-iphonesimulator/ deepspeech_ios.framework \
-         | ${XZ} > "${TASKCLUSTER_ARTIFACTS}/deepspeech_ios.framework.x86_64.tar.xz"
+  release_folder="Release-iphonesimulator"
+  artifact_name="deepspeech_ios.framework.x86_64.tar.xz"
   ;;
 "--arm64")
-  ${TAR} -cf - \
-         -C ${DS_ROOT_TASK}/DeepSpeech/ds/native_client/swift/DerivedData/Build/Products/Release-iphoneos/ deepspeech_ios.framework \
-         | ${XZ} > "${TASKCLUSTER_ARTIFACTS}/deepspeech_ios.framework.arm64.tar.xz"
+  release_folder="Release-iphoneos"
+  artifact_name="deepspeech_ios.framework.arm64.tar.xz"
 ;;
 esac
+
+${TAR} -cf - \
+       -C ${DS_ROOT_TASK}/DeepSpeech/ds/native_client/swift/DerivedData/Build/Products/${release_folder}/ deepspeech_ios.framework \
+       | ${XZ} > "${TASKCLUSTER_ARTIFACTS}/${artifact_name}"
\ No newline at end of file
diff --git a/taskcluster/tc-build-utils.sh b/taskcluster/tc-build-utils.sh
index ac0bd39e..d4386ff5 100755
--- a/taskcluster/tc-build-utils.sh
+++ b/taskcluster/tc-build-utils.sh
@@ -323,10 +323,13 @@ do_deepspeech_ios_framework_build()
   cd ${DS_DSDIR}/native_client/swift
   case $arch in
   "--x86_64")
-    xcodebuild -workspace deepspeech_ios.xcworkspace -scheme deepspeech_ios_test -configuration Release -arch x86_64 -sdk "iphonesimulator" -derivedDataPath DerivedData CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
+    iosSDK="iphonesimulator"
+    xcodeArch="x86_64"
     ;;
   "--arm64")
-    xcodebuild -workspace deepspeech_ios.xcworkspace -scheme deepspeech_ios_test -configuration Release -arch arm64 -sdk "iphoneos" -derivedDataPath DerivedData CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
+    iosSDK="iphoneos"
+    xcodeArch="arm64"
     ;;
   esac
+  xcodebuild -workspace deepspeech_ios.xcworkspace -scheme deepspeech_ios_test -configuration Release -arch "${xcodeArch}" -sdk "${iosSDK}" -derivedDataPath DerivedData CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
 }