You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2013/07/11 01:20:27 UTC
svn commit: r1502056 -
/hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
Author: cnauroth
Date: Wed Jul 10 23:20:26 2013
New Revision: 1502056
URL: http://svn.apache.org/r1502056
Log:
MAPREDUCE-4374. Merging change r1502054 from branch-2.1-beta to branch-2.1.0-beta.
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
Modified: hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java?rev=1502056&r1=1502055&r2=1502056&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java (original)
+++ hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java Wed Jul 10 23:20:26 2013
@@ -136,6 +136,12 @@ abstract public class Shell {
new String[] { "kill", "-" + code, isSetsidAvailable ? "-" + pid : pid };
}
+ /** Return a regular expression string that match environment variables */
+ public static String getEnvironmentVariableRegex() {
+ return (WINDOWS) ? "%([A-Za-z_][A-Za-z0-9_]*?)%" :
+ "\\$([A-Za-z_][A-Za-z0-9_]*)";
+ }
+
/**
* Returns a File referencing a script with the given basename, inside the
* given parent directory. The file extension is inferred by platform: ".cmd"