From 871fa82620b672c8ac3f8207e8913e1b7f3bb3ea Mon Sep 17 00:00:00 2001
From: Christopher Snowhill <kode54@gmail.com>
Date: Wed, 27 Dec 2017 17:33:52 -0800
Subject: [PATCH] Hopefully fix Travis CI building once and for all.

---
 .travis.yml                   |  2 +-
 Cog.xcodeproj/project.pbxproj |  2 +-
 Scripts/build.sh              | 18 +++++++++++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 01c359b72..4288fb3e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,4 +2,4 @@ os: osx
 osx_image: xcode9.2
 language: objective-c
 script:
-    - Scripts/build.sh CODE_SIGNING_REQUIRED=NO
+    - Scripts/build.sh -n
diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj
index e50feae7e..cedce24d9 100644
--- a/Cog.xcodeproj/project.pbxproj
+++ b/Cog.xcodeproj/project.pbxproj
@@ -2505,7 +2505,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "${PROJECT_DIR}/Scripts/genversion.sh\ncodesign -f -s \"${CODE_SIGN_IDENTITY}\" --deep \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.app\"";
+			shellScript = "${PROJECT_DIR}/Scripts/genversion.sh\nif [ "$CODE_SIGN_IDENTITY" -ne "" ]; then codesign -f -s \"${CODE_SIGN_IDENTITY}\" --deep \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.app\"; fi";
 		};
 /* End PBXShellScriptBuildPhase section */
 
diff --git a/Scripts/build.sh b/Scripts/build.sh
index 17980edc2..662f44edf 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -4,7 +4,23 @@ pushd $(dirname $0)
 BASE=`pwd -P`
 popd
 
+sign=true
+
+while getopts ":hn" option; do
+  case $option in
+    h) echo "usage: $0 [-h] [-n]"; exit ;;
+    n) sign=false ;;
+    ?) echo "error: option -$OPTARG is not implemented"; exit ;;
+  esac
+done
+
+SIGNARGS=""
+
+if [ "$sign" = true ] ; then
+  SIGNARGS=('CODE_SIGN_IDENTITY=""' 'CODE_SIGNING_REQUIRED=NO')
+fi
+
 BUILDPRODUCTS="$BASE"/build/Build/Products/Release
 
-xcodebuild -quiet -workspace "$BASE"/../Cog.xcodeproj/project.xcworkspace -scheme Cog -configuration Release -derivedDataPath "$BASE"/build $1
+xcodebuild -quiet -workspace "$BASE"/../Cog.xcodeproj/project.xcworkspace -scheme Cog -configuration Release -derivedDataPath "$BASE"/build ${SIGNARGS[*]}