Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-20 07:46:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Development

Browse Source
This commit is contained in:
Manfred Karrer 2016-06-12 17:36:56 +02:00
commit bbb6febe37
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/io/bitsquare/common/util/Utilities.java
View File

@ -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 {

6
jtorproxy/src/main/java/com/msopentech/thali/toronionproxy/OsData.java
View File

@ -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);