From 75bbdb15e6f90d4f690b839f6db0cedfb61045be Mon Sep 17 00:00:00 2001 From: axtloss Date: Thu, 25 May 2023 21:42:55 +0200 Subject: Make the start command work I should rename this to "JHackIT", because this only consists of hacks lmao --- src/main/java/io/github/jshipit/SysUtils.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/main/java/io/github/jshipit/SysUtils.java') 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 ""; } } -- cgit v1.2.3