svn commit: r429868 - in /lucene/hadoop/trunk: CHANGES.txt src/contrib/streaming/src/java/org/apache/hadoop/streaming/Environment.java

[cu...@apache.org]

Author: cutting
Date: Tue Aug  8 15:40:52 2006
New Revision: 429868

URL: http://svn.apache.org/viewvc?rev=429868&view=rev
Log:
HADOOP-426.  Fix streaming contrib module to work correctly on Solaris.  This was causing nightly builds to fail.  Contributed by Michel.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/Environment.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=429868&r1=429867&r2=429868&view=diff
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Tue Aug  8 15:40:52 2006
@@ -7,6 +7,10 @@
     web UI code with DatanodeInfo, the preferred public class.
     (Devaraj Das via cutting)
 
+ 2. HADOOP-426.  Fix streaming contrib module to work correctly on
+    Solaris.  This was causing nightly builds to fail.
+    (Michel Tourn via cutting)
+
 
 Release 0.5.0 - 2006-08-04
 

Modified: lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/Environment.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/Environment.java?rev=429868&r1=429867&r2=429868&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/Environment.java (original)
+++ lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/Environment.java Tue Aug  8 15:40:52 2006
@@ -30,12 +30,16 @@
    {
       // Extend this code to fit all operating
       // environments that you expect to run in
+      // http://lopica.sourceforge.net/os.html
       String command = null;
       String OS = System.getProperty("os.name");
       String lowerOs = OS.toLowerCase();
       if (OS.indexOf("Windows") > -1) {
          command = "cmd /C set";
-      } else if (OS.indexOf("ix") > -1 || OS.indexOf("inux") > -1) {
+      } else if (lowerOs.indexOf("ix") > -1 || lowerOs.indexOf("linux") > -1 
+        || lowerOs.indexOf("freebsd") > -1
+        || lowerOs.indexOf("sunos") > -1 || lowerOs.indexOf("solaris") > -1
+        || lowerOs.indexOf("hp-ux") > -1) {
          command = "env";
       } else if(lowerOs.startsWith("mac os x")) {
          command = "env";