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

check for rc file next to sigar.jar too

This commit is contained in:
Doug MacEachern 2004-07-23 01:05:23 +00:00
parent 530f6b9f2b
commit 5f7baaa447
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bindings/java/src/net/hyperic/sigar/cmd/Shell.java
View File

@ -7,6 +7,7 @@ import java.util.ArrayList;
import net.hyperic.sigar.Sigar; import net.hyperic.sigar.Sigar;
import net.hyperic.sigar.SigarException; import net.hyperic.sigar.SigarException;
import net.hyperic.sigar.SigarLoader;
import net.hyperic.sigar.SigarProxy; import net.hyperic.sigar.SigarProxy;
import net.hyperic.sigar.SigarProxyCache; import net.hyperic.sigar.SigarProxyCache;
@ -125,8 +126,9 @@ public class Shell extends ShellBase {
return this.foundPids; return this.foundPids;
} }
public void readCommandFile(File rc) { public void readCommandFile(String dir) {
try { try {
File rc = new File(dir, RCFILE_NAME);
readRCFile(rc, false); readRCFile(rc, false);
this.out.println("Loaded rc file: " + rc); this.out.println("Loaded rc file: " + rc);
} catch (IOException e) { } } catch (IOException e) { }
@ -138,10 +140,10 @@ public class Shell extends ShellBase {
try { try {
shell.init("sigar", System.out, System.err); shell.init("sigar", System.out, System.err);
shell.registerCommands(); shell.registerCommands();
String home = System.getProperty("user.home");
shell.readCommandFile(new File(home, RCFILE_NAME)); shell.readCommandFile(System.getProperty("user.home"));
shell.readCommandFile(new File(RCFILE_NAME)); shell.readCommandFile(".");
shell.readCommandFile(SigarLoader.getLocation());
if (args.length == 0) { if (args.length == 0) {
shell.isInteractive = true; shell.isInteractive = true;