am 169c19c: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."

* commit '169c19ccb566d72a8ea142afb2550f9c54c5fea9': Envsetup: Cygwin doesn't have 'ps -o command'.
mozilla-b2g · Jun 22, 2011 · 7f5a314 · 7f5a314
2 parents 683e8e1 + 169c19c
commit 7f5a314
Showing 1 changed file with 9 additions and 7 deletions.
diff --git 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`