Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.

Commit b8618d3

Browse files
committed
Merge pull request #1705 from maicki/FixBuildScriptXcprettyFormatter
[Build] Skip using xcpretty-travis-formatter if it is not installed
2 parents e5eed56 + 0d925c7 commit b8618d3

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

build.sh

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ trap trap_handler INT TERM EXIT
1717

1818
MODE="$1"
1919

20+
if type xcpretty-travis-formatter &> /dev/null; then
21+
FORMATTER="-f $(xcpretty-travis-formatter)"
22+
else
23+
FORMATTER="-s"
24+
fi
25+
2026
if [ "$MODE" = "tests" ]; then
2127
echo "Building & testing AsyncDisplayKit."
2228
pod install
@@ -25,7 +31,7 @@ if [ "$MODE" = "tests" ]; then
2531
-scheme AsyncDisplayKit \
2632
-sdk "$SDK" \
2733
-destination "$PLATFORM" \
28-
build test | xcpretty -f `xcpretty-travis-formatter`
34+
build test | xcpretty $FORMATTER
2935
trap - EXIT
3036
exit 0
3137
fi
@@ -45,7 +51,7 @@ if [ "$MODE" = "examples" ]; then
4551
-scheme Sample \
4652
-sdk "$SDK" \
4753
-destination "$PLATFORM" \
48-
build | xcpretty -f `xcpretty-travis-formatter`
54+
build | xcpretty $FORMATTER
4955
elif [ -f "${example}/Cartfile" ]; then
5056
echo "Using Carthage"
5157
local_repo=`pwd`
@@ -60,7 +66,7 @@ if [ "$MODE" = "examples" ]; then
6066
-scheme Sample \
6167
-sdk "$SDK" \
6268
-destination "$PLATFORM" \
63-
build | xcpretty -f `xcpretty-travis-formatter`
69+
build | xcpretty $FORMATTER
6470

6571
cd ../..
6672
fi
@@ -77,7 +83,7 @@ if [ "$MODE" = "life-without-cocoapods" ]; then
7783
-scheme "Life Without CocoaPods" \
7884
-sdk "$SDK" \
7985
-destination "$PLATFORM" \
80-
build | xcpretty -f `xcpretty-travis-formatter`
86+
build | xcpretty $FORMATTER
8187
trap - EXIT
8288
exit 0
8389
fi
@@ -90,7 +96,7 @@ if [ "$MODE" = "framework" ]; then
9096
-scheme Sample \
9197
-sdk "$SDK" \
9298
-destination "$PLATFORM" \
93-
build | xcpretty -f `xcpretty-travis-formatter`
99+
build | xcpretty $FORMATTER
94100
trap - EXIT
95101
exit 0
96102
fi

0 commit comments

Comments
 (0)