Only run swiftlint if it exists in ./Pods. Fixes TakeScoop#66 TakeSco…

…op#65
yh2015 · Apr 13, 2017 · 3abea2a · 3abea2a
1 parent a6df967
commit 3abea2a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ SwiftyRSA Changelog
 
 # [master]
 
+ - Fixed Carthage integration by running SwiftLint only if it exists in a Pods directory.
+   [#66](https://github.com/TakeScoop/SwiftyRSA/issues/66)
+   [#65](https://github.com/TakeScoop/SwiftyRSA/issues/65)
+
 # [1.1.0]
 
  - `PublicKey` and `PrivateKey` now expose their keychain reference and the data they were created with, in the `reference` and `originalData` fields.

diff --git a/SwiftyRSA.xcodeproj/project.pbxproj b/SwiftyRSA.xcodeproj/project.pbxproj
@@ -436,7 +436,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/SwiftLint/swiftlint\"";
+			shellScript = "SWIFTLINT=\"${SRCROOT}/Pods/SwiftLint/swiftlint\"\nif test -x \"${SWIFTLINT}\"; then\n    ${SWIFTLINT}\nfi";
 		};
 		C0CB61901E8B96E400185EB6 /* SwiftLint */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -450,7 +450,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/SwiftLint/swiftlint\"";
+			shellScript = "SWIFTLINT=\"${SRCROOT}/Pods/SwiftLint/swiftlint\"\nif test -x \"${SWIFTLINT}\"; then\n    ${SWIFTLINT}\nfi";
 		};
 		C0CB61911E8B96F400185EB6 /* SwiftLint */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -464,7 +464,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/SwiftLint/swiftlint\"";
+			shellScript = "SWIFTLINT=\"${SRCROOT}/Pods/SwiftLint/swiftlint\"\nif test -x \"${SWIFTLINT}\"; then\n    ${SWIFTLINT}\nfi";
 		};
 /* End PBXShellScriptBuildPhase section */