From d5e76ef345877dffdc2eab46a67df4631319a0d1 Mon Sep 17 00:00:00 2001 From: dgelessus <dgelessus@users.noreply.github.com> Date: Mon, 24 Oct 2022 16:31:55 +0200 Subject: [PATCH] Remove dead 32-bit Linux handling from CliStarter --- de.prob.core/src/de/prob/cli/CliStarter.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/de.prob.core/src/de/prob/cli/CliStarter.java b/de.prob.core/src/de/prob/cli/CliStarter.java index a7b42f14..c4e8a0a9 100644 --- a/de.prob.core/src/de/prob/cli/CliStarter.java +++ b/de.prob.core/src/de/prob/cli/CliStarter.java @@ -65,12 +65,11 @@ public final class CliStarter { debuggingKey = null; final String os = Platform.getOS(); - final String arch = Platform.getOSArch(); final File applicationPath = getCliPath(); final String fullcp = createFullClasspath(os, applicationPath); - final OsSpecificInfo osInfo = getOsInfo(os, arch); + final OsSpecificInfo osInfo = getOsInfo(os); final String osPath = applicationPath + File.separator + osInfo.subdir; final String executable = osPath + File.separator + osInfo.cliName; @@ -135,7 +134,7 @@ public final class CliStarter { } - private OsSpecificInfo getOsInfo(final String os, String architecture) + private OsSpecificInfo getOsInfo(final String os) throws CliException { if (os.equals(Platform.OS_MACOSX)) { return new OsSpecificInfo("macos", "probcli.sh", "sh", @@ -147,11 +146,7 @@ public final class CliStarter { } if (os.equals(Platform.OS_LINUX)) { - String linux = "linux"; - if (architecture.equals(Platform.ARCH_X86_64)) { - linux = "linux64"; - } - return new OsSpecificInfo(linux, "probcli.sh", "sh", + return new OsSpecificInfo("linux64", "probcli.sh", "sh", "lib/send_user_interrupt"); } final CliException cliException = new CliException( -- GitLab