ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Added MultiCommandExecutor class and an incomplete proof of concept ip scanner

Browse source
This commit is contained in:
Ziver Koc 2016-09-11 21:55:54 +02:00
parent 46de7e05d1
commit 985cb8b1de
10 changed files with 353 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/zutil/osal/app/linux/AptGet.java
View file

@ -43,13 +43,13 @@ public class AptGet {
public static void install(String pkg) {
update();
OSAbstractionLayer.runCommand("apt-get -y install " + pkg);
OSAbstractionLayer.exec("apt-get -y install " + pkg);
packageTimer.reset();
}
public static void upgrade(){
update();
OSAbstractionLayer.runCommand("apt-get -y " +
OSAbstractionLayer.exec("apt-get -y " +
// Dont display configuration conflicts
"-o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" " +
"upgrade");
@ -59,13 +59,13 @@ public class AptGet {
public static void update(){
// Only run every 5 min
if(updateTimer.hasTimedOut()){
OSAbstractionLayer.runCommand("apt-get update");
OSAbstractionLayer.exec("apt-get update");
updateTimer.start();
}
}
public static void purge(String pkg) {
OSAbstractionLayer.runCommand("apt-get --purge remove " + pkg);
OSAbstractionLayer.exec("apt-get --purge remove " + pkg);
packageTimer.reset();
}
@ -77,7 +77,7 @@ public class AptGet {
public static synchronized void updatePackages(){
// Only run every 5 min
if(packageTimer.hasTimedOut()){
String[] output = OSAbstractionLayer.runCommand("dpkg --list");
String[] output = OSAbstractionLayer.exec("dpkg --list");
for(int i=5; i<output.length; ++i) {
packages.put(output[i], new Package(output[5]));
}

2
src/zutil/osal/app/linux/Ps.java
View file

@ -33,7 +33,7 @@ public class Ps {
private static OSAbstractionLayer os = OSAbstractionLayer.getInstance();
public static boolean isRunning(int pid){
String[] output = os.runCommand("ps -p "+pid);
String[] output = os.exec("ps -p "+pid);
return output.length > 1;
}
}