Fixed build error bash script extension on linux.

ilk33r · Sep 3, 2016 · 75a453d · 75a453d
1 parent 7606702
commit 75a453d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/Extensions/BashScriptHandler/BashScriptHandler.swift b/Extensions/BashScriptHandler/BashScriptHandler.swift
@@ -312,7 +312,12 @@ public class BashScriptHandler: AppHandlers {
 
 				let strippedResponse = response.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
 				do {
+				#if os(Linux)
+					let internalExpression = try RegularExpression(pattern: "OK", options: .caseInsensitive)
+				#else
 					let internalExpression = try NSRegularExpression(pattern: "OK", options: .caseInsensitive)
+				#endif
+
 					let matches = internalExpression.matches(in: strippedResponse, options: .reportProgress, range:NSMakeRange(0, strippedResponse.characters.count))
 
 					if(matches.count > 0) {

diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/ilk3r.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/ilk3r.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Travis/Build.sh b/Travis/Build.sh
@@ -18,7 +18,7 @@ if [[ $TEST_BRANCH == $TRAVIS_BRANCH ]]; then
 			SWIFT_PATH='/usr/local/swift/bin'
 		fi
 
-		docker run -e "OS_RELEASE=${DOCKER_OS_RELEASE}" -e "PATH=${SWIFT_PATH}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" -e "TRAVIS_COMMIT=${TRAVIS_COMMIT}" -e "TRAVIS_IMAGE=${TRAVIS_IMAGE}" ilk3r/iorunner:${DOCKER_IMAGE} /bin/bash -c "cd /root/ilk33r/IORunner/; git pull; make dist-clean; make dist; make deploy;"
+		docker run -e "OS_RELEASE=${DOCKER_OS_RELEASE}" -e "PATH=${SWIFT_PATH}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" -e "TRAVIS_COMMIT=${TRAVIS_COMMIT}" -e "TRAVIS_IMAGE=${TRAVIS_IMAGE}" ilk3r/iorunner:${DOCKER_IMAGE} /bin/bash -c "cd /root/ilk33r/IORunner/; git reset --hard origin/master; git pull; make dist-clean; make dist; make deploy;"
 
 	else
 		make dist-clean