From 0d925c7a82238cfdfd93a19d5a632755a728d97f Mon Sep 17 00:00:00 2001 From: Michael Schneider Date: Fri, 3 Jun 2016 09:24:35 -0700 Subject: [PATCH] Fix build script error if running locally and xcpretty-travis-formatter is not installed --- build.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index c225433498..a32640bb07 100755 --- a/build.sh +++ b/build.sh @@ -17,6 +17,12 @@ trap trap_handler INT TERM EXIT MODE="$1" +if type xcpretty-travis-formatter &> /dev/null; then + FORMATTER="-f $(xcpretty-travis-formatter)" + else + FORMATTER="-s" +fi + if [ "$MODE" = "tests" ]; then echo "Building & testing AsyncDisplayKit." pod install @@ -25,7 +31,7 @@ if [ "$MODE" = "tests" ]; then -scheme AsyncDisplayKit \ -sdk "$SDK" \ -destination "$PLATFORM" \ - build test | xcpretty -f `xcpretty-travis-formatter` + build test | xcpretty $FORMATTER trap - EXIT exit 0 fi @@ -45,7 +51,7 @@ if [ "$MODE" = "examples" ]; then -scheme Sample \ -sdk "$SDK" \ -destination "$PLATFORM" \ - build | xcpretty -f `xcpretty-travis-formatter` + build | xcpretty $FORMATTER elif [ -f "${example}/Cartfile" ]; then echo "Using Carthage" local_repo=`pwd` @@ -60,7 +66,7 @@ if [ "$MODE" = "examples" ]; then -scheme Sample \ -sdk "$SDK" \ -destination "$PLATFORM" \ - build | xcpretty -f `xcpretty-travis-formatter` + build | xcpretty $FORMATTER cd ../.. fi @@ -77,7 +83,7 @@ if [ "$MODE" = "life-without-cocoapods" ]; then -scheme "Life Without CocoaPods" \ -sdk "$SDK" \ -destination "$PLATFORM" \ - build | xcpretty -f `xcpretty-travis-formatter` + build | xcpretty $FORMATTER trap - EXIT exit 0 fi @@ -90,7 +96,7 @@ if [ "$MODE" = "framework" ]; then -scheme Sample \ -sdk "$SDK" \ -destination "$PLATFORM" \ - build | xcpretty -f `xcpretty-travis-formatter` + build | xcpretty $FORMATTER trap - EXIT exit 0 fi