From 70a86b0fb79d0d9c79fb34181ceb9268ea4685dd Mon Sep 17 00:00:00 2001
From: Raphael Moll <ralf@android.com>
Date: Mon, 20 Jun 2011 16:03:14 -0700
Subject: [PATCH] Envsetup: Cygwin doesn't have 'ps -o command'.

Running build/envsetup.sh on cygwin always shows a
warning since there is no 'ps -o command' option.
Bash already sets SHELL=/bin/bash so we can rely on that if present.

Change-Id: I145b42508985735ba61d2b53b216ecc56e321943
---
 envsetup.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/envsetup.sh b/envsetup.sh
index c94ca7b1d4..fe262f6ab8 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1077,13 +1077,15 @@ function set_java_home() {
     fi
 }
 
-case `ps -o command -p $$` in
-    *bash*)
-        ;;
-    *)
-        echo "WARNING: Only bash is supported, use of other shell would lead to erroneous results"
-        ;;
-esac
+if [ "x$SHELL" != "x/bin/bash" ]; then
+    case `ps -o command -p $$` in
+        *bash*)
+            ;;
+        *)
+            echo "WARNING: Only bash is supported, use of other shell would lead to erroneous results"
+            ;;
+    esac
+fi
 
 # Execute the contents of any vendorsetup.sh files we can find.
 for f in `/bin/ls vendor/*/vendorsetup.sh vendor/*/*/vendorsetup.sh device/*/*/vendorsetup.sh 2> /dev/null`