diff options
| author |  Yun Peng <pcloudy@google.com> | 2016-06-28 16:57:30 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2016-06-29 08:53:51 +0000 |
| commit | cb226127fa817fabf149015f8d4af6de93297366 (patch) | |
| tree | 40862a7d192c343f370fe2abfb7764a8ab6a6047 /src | |
| parent | 34cdae35dba538a5d834b9ae18c4e493bbad878c (diff) | |
Fix is_windows function
--
Change-Id: I88c67ba382288f0a908aba97571564434eaae2d0
Reviewed-on: https://bazel-review.googlesource.com/#/c/3917
MOS_MIGRATED_REVID=126085117
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt | 2 | ||||
| -rwxr-xr-x | src/test/shell/bazel/testenv.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt index 443c697e58..6cd1c652b1 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt @@ -77,7 +77,7 @@ die() { PLATFORM="$(uname -s | tr 'A-Z' 'a-z')" function is_windows() { # On windows, the shell test actually running on msys - if [ "${PLATFORM}" == "msys_nt-6.1" ]; then + if [[ "${PLATFORM}" =~ msys_nt* ]]; then true else false diff --git a/src/test/shell/bazel/testenv.sh b/src/test/shell/bazel/testenv.sh index df659ff0fe..8e8f3828c3 100755 --- a/src/test/shell/bazel/testenv.sh +++ b/src/test/shell/bazel/testenv.sh @@ -46,7 +46,7 @@ bazel_data="${BAZEL_RUNFILES}" PLATFORM="$(uname -s | tr 'A-Z' 'a-z')" function is_windows() { # On windows, the shell test actually running on msys - if [ "${PLATFORM}" == "msys_nt-6.1" ]; then + if [[ "${PLATFORM}" =~ msys_nt* ]]; then true else false |