From 091b73ab6f72659a56f704314f78e55b337cc4bc Mon Sep 17 00:00:00 2001
From: Dan Field <dfield@gmail.com>
Date: Wed, 14 Nov 2018 18:54:51 -0800
Subject: [PATCH] fix variable check in xcode_backend.sh (#24368)

* fix test in xcode_backend.sh

* -n

* fix devicelab test

* uncomment good code, check for \"\"
---
 dev/devicelab/bin/tasks/module_test_ios.dart |  4 ++--
 packages/flutter_tools/bin/xcode_backend.sh  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev/devicelab/bin/tasks/module_test_ios.dart b/dev/devicelab/bin/tasks/module_test_ios.dart
index 284455c6fd..b4058c53d4 100644
--- a/dev/devicelab/bin/tasks/module_test_ios.dart
+++ b/dev/devicelab/bin/tasks/module_test_ios.dart
@@ -154,8 +154,8 @@ Future<void> main() async {
             'Debug',
             'CODE_SIGNING_ALLOWED=NO',
             'CODE_SIGNING_REQUIRED=NO',
-            'CODE_SIGNING_IDENTITY=""',
-            'EXPANDED_CODE_SIGN_IDENTITY=""',
+            'CODE_SIGN_IDENTITY=',
+            'EXPANDED_CODE_SIGN_IDENTITY=',
             'CONFIGURATION_BUILD_DIR=${tempDir.path}',
           ],
         );
diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh
index 8973f9ccc0..ac05bb56e1 100755
--- a/packages/flutter_tools/bin/xcode_backend.sh
+++ b/packages/flutter_tools/bin/xcode_backend.sh
@@ -55,7 +55,7 @@ BuildApp() {
     release*) build_mode="release"; artifact_variant="ios-release";;
     profile*) build_mode="profile"; artifact_variant="ios-profile";;
     debug*) build_mode="debug"; artifact_variant="ios";;
-    *) 
+    *)
       EchoError "========================================================================"
       EchoError "ERROR: Unknown FLUTTER_BUILD_MODE: ${build_mode}."
       EchoError "Valid values are 'Debug', 'Profile', or 'Release' (case insensitive)."
@@ -83,8 +83,8 @@ BuildApp() {
   fi
 
   local framework_path="${FLUTTER_ROOT}/bin/cache/artifacts/engine/${artifact_variant}"
-  
-  AssertExists "${framework_path}"  
+
+  AssertExists "${framework_path}"
   AssertExists "${project_path}"
 
   local derived_dir="${SOURCE_ROOT}/Flutter"
@@ -360,14 +360,14 @@ EmbedFlutterFrameworks() {
 
   # Embed the actual Flutter.framework that the Flutter app expects to run against,
   # which could be a local build or an arch/type specific build.
-  # Remove it first since Xcode might be trying to hold some of these files - this way we're 
+  # Remove it first since Xcode might be trying to hold some of these files - this way we're
   # sure to get a clean copy.
   RunCommand rm -rf -- "${xcode_frameworks_dir}/Flutter.framework"
   RunCommand cp -Rv -- "${flutter_ios_engine_folder}/Flutter.framework" "${xcode_frameworks_dir}/"
-  
+
   # Sign the binaries we moved.
   local identity="${EXPANDED_CODE_SIGN_IDENTITY_NAME:-$CODE_SIGN_IDENTITY}"
-  if (${identity} != ""); then
+  if [[ -n "$identity" && "$identity" != "\"\"" ]]; then
     RunCommand codesign --force --verbose --sign "${identity}" -- "${xcode_frameworks_dir}/App.framework/App"
     RunCommand codesign --force --verbose --sign "${identity}" -- "${xcode_frameworks_dir}/Flutter.framework/Flutter"
   fi