bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sigar-1.6'

This commit is contained in:
Doug MacEachern 2010-04-16 11:01:17 -07:00
parent 21a7b096d5 aa2cbaa89b
commit a8963528fc
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bindings/java/src/org/hyperic/sigar/cmd/Runner.java
View File

@ -31,6 +31,7 @@ import java.lang.reflect.InvocationTargetException;
import java.net.URLClassLoader;
import java.net.URL;
import org.hyperic.sigar.Sigar;
import org.hyperic.sigar.SigarLoader;
public class Runner {
@ -136,6 +137,21 @@ public class Runner {
return !missingJars();
}
private static String getenv(String key) {
try {
return System.getenv("ANT_HOME"); //check for junit.jar
} catch (Error e) {
/*1.4*/
Sigar sigar = new Sigar();
try {
return sigar.getProcEnv("$$", "ANT_HOME");
} catch (Exception se) {
return null;
}
finally { sigar.close(); }
}
}
public static void main(String[] args) throws Exception {
if (args.length < 1) {
args = new String[] { "Shell" };
@ -184,7 +200,7 @@ public class Runner {
}
if (missingJars()) {
String home = System.getenv("ANT_HOME"); //check for junit.jar
String home = getenv("ANT_HOME"); //check for junit.jar
if (home != null) {
addJarDir(home + "/lib");
}