aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io/github/jshipit/SysUtils.java
diff options
context:
space:
mode:
authoraxtloss <axtlos@getcryst.al>2023-05-25 21:42:55 +0200
committeraxtloss <axtlos@getcryst.al>2023-05-25 21:42:55 +0200
commit75bbdb15e6f90d4f690b839f6db0cedfb61045be (patch)
tree2ae2184baeb3786239f1298098c810f769a37fce /src/main/java/io/github/jshipit/SysUtils.java
parentfda79997703823e7d65e9f639a3247119a97e5b3 (diff)
downloadjshipit-75bbdb15e6f90d4f690b839f6db0cedfb61045be.tar.gz
jshipit-75bbdb15e6f90d4f690b839f6db0cedfb61045be.tar.bz2
Make the start command work
I should rename this to "JHackIT", because this only consists of hacks lmao
Diffstat (limited to '')
-rw-r--r--src/main/java/io/github/jshipit/SysUtils.java14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/main/java/io/github/jshipit/SysUtils.java b/src/main/java/io/github/jshipit/SysUtils.java
index e6de886..144c401 100644
--- a/src/main/java/io/github/jshipit/SysUtils.java
+++ b/src/main/java/io/github/jshipit/SysUtils.java
@@ -29,9 +29,12 @@ public class SysUtils {
}
}
- public void execInBwrap(String[] args) {
+ public String execInBwrap(String[] args, boolean execute) {
//System.out.println("bwrap "+String.join(" ", args));
- ProcessBuilder pb = new ProcessBuilder("bwrap", args.toString());
+ if (!execute) {
+ return "bwrap "+String.join(" ", args);
+ }
+ ProcessBuilder pb = new ProcessBuilder("bash", "-c", "bwrap "+String.join(" ", args));
pb.inheritIO();
try {
Process p = pb.start();
@@ -39,9 +42,13 @@ public class SysUtils {
} catch (Exception e) {
throw new RuntimeException(e);
}
+ return "";
}
- public void overlayMount(String[] lower, String upper, String target, String work) {
+ public String overlayMount(String[] lower, String upper, String target, String work, boolean execute) {
+ if (!execute) {
+ return "mount -t overlay overlay -o lowerdir="+String.join(":", lower)+",upperdir="+upper+",workdir="+work+" "+target;
+ }
if (Platform.isLinux()) {
ProcessBuilder pb = new ProcessBuilder("unshare", "--user", "--map-root-user", "--mount", "mount", "-t", "overlay", "overlay", "-o", "lowerdir="+String.join(":", lower)+",upperdir="+upper+",workdir="+work, target);
@@ -57,5 +64,6 @@ public class SysUtils {
System.out.println("Platform not supported.");
System.out.println("mount -t overlay overlay -o lowerdir="+String.join(":", lower)+",upperdir="+upper+",workdir="+work+" "+target);
}
+ return "";
}
}