diff --git a/Extensions/BashScriptHandler/BashScriptHandler.swift b/Extensions/BashScriptHandler/BashScriptHandler.swift index 5ae2664..fceb84b 100644 --- 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/IORunner.xcodeproj/project.xcworkspace/xcuserdata/ilk3r.xcuserdatad/UserInterfaceState.xcuserstate b/IORunner.xcodeproj/project.xcworkspace/xcuserdata/ilk3r.xcuserdatad/UserInterfaceState.xcuserstate index a99dc78..87ba173 100644 Binary files a/IORunner.xcodeproj/project.xcworkspace/xcuserdata/ilk3r.xcuserdatad/UserInterfaceState.xcuserstate and b/IORunner.xcodeproj/project.xcworkspace/xcuserdata/ilk3r.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Travis/Build.sh b/Travis/Build.sh index cd4b7c5..40a5372 100755 --- 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