From 5a2c17af8049c9eb6be8671cb70d4693a3d1db39 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 12 Jun 2016 17:34:29 +0200 Subject: [PATCH] Add checks for arm OS arch --- .../src/main/java/io/bitsquare/common/util/Utilities.java | 2 ++ .../java/com/msopentech/thali/toronionproxy/OsData.java | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/common/src/main/java/io/bitsquare/common/util/Utilities.java b/common/src/main/java/io/bitsquare/common/util/Utilities.java index 76ce508dfe..b138f9654a 100644 --- a/common/src/main/java/io/bitsquare/common/util/Utilities.java +++ b/common/src/main/java/io/bitsquare/common/util/Utilities.java @@ -133,6 +133,8 @@ public class Utilities { return arch.endsWith("64") || wow64Arch != null && wow64Arch.endsWith("64") ? "64" : "32"; + } else if (osArch.contains("arm")) { + return osArch.contains("64") ? "64" : "32"; } else if (isLinux()) { return osArch.startsWith("i") ? "32" : "64"; } else { diff --git a/jtorproxy/src/main/java/com/msopentech/thali/toronionproxy/OsData.java b/jtorproxy/src/main/java/com/msopentech/thali/toronionproxy/OsData.java index e0cbb6a81f..77f2aad277 100644 --- a/jtorproxy/src/main/java/com/msopentech/thali/toronionproxy/OsData.java +++ b/jtorproxy/src/main/java/com/msopentech/thali/toronionproxy/OsData.java @@ -87,12 +87,18 @@ public class OsData { throw new RuntimeException("Uname returned error code " + exit); } + System.out.println("INFO: uname -m call results in:" + unameOutput); + if (unameOutput.matches("i.86")) { return OsType.Linux32; } if (unameOutput.compareTo("x86_64") == 0) { return OsType.Linux64; } + + if (unameOutput.contains("arm")) + return unameOutput.contains("64") ? OsType.Linux64 : OsType.Linux32; + throw new RuntimeException("Could not understand uname output, not sure what bitness"); } catch (IOException e) { throw new RuntimeException("Uname failure", e);