beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-25 00:50:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix linux dist

Browse source
This commit is contained in:
crschnick 2022-01-31 10:38:11 -08:00
parent cb8f1239ad
commit b2af324993
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
beacon/src/main/java/io/xpipe/beacon/BeaconServer.java
View file

@ -42,16 +42,16 @@ public class BeaconServer {
return false; return false;
} }
private static Optional<Path> getPortableExecutable() { private static Optional<Path> getPortableLauncherExecutable() {
var env = System.getenv("XPIPE_HOME"); var env = System.getenv("XPIPE_HOME");
Path file = null; Path file = null;
// Prepare for invalid XPIPE_HOME path value // Prepare for invalid XPIPE_HOME path value
try { try {
if (System.getProperty("os.name").startsWith("Windows")) { if (System.getProperty("os.name").startsWith("Windows")) {
file = Path.of(env, "xpipe.exe"); file = Path.of(env, "xpipe-launcher.exe");
} else { } else {
file = Path.of(env, "xpipe"); file = Path.of(env, "xpipe-launcher");
} }
return Files.exists(file) ? Optional.of(file) : Optional.empty(); return Files.exists(file) ? Optional.of(file) : Optional.empty();
} catch (Exception ex) { } catch (Exception ex) {
@ -60,7 +60,7 @@ public class BeaconServer {
} }
public static Optional<Path> getLauncherExecutable() { public static Optional<Path> getLauncherExecutable() {
var portable = getPortableExecutable(); var portable = getPortableLauncherExecutable();
if (portable.isPresent()) { if (portable.isPresent()) {
return portable; return portable;
} }
@ -68,9 +68,9 @@ public class BeaconServer {
try { try {
Path file = null; Path file = null;
if (System.getProperty("os.name").startsWith("Windows")) { if (System.getProperty("os.name").startsWith("Windows")) {
file = Path.of(System.getenv("LOCALAPPDATA"), "X-Pipe", "xpipe.exe"); file = Path.of(System.getenv("LOCALAPPDATA"), "X-Pipe", "xpipe-launcher.exe");
} else { } else {
file = Path.of("/opt/xpipe/xpipe"); file = Path.of("/opt/xpipe/xpipe-launcher");
} }
return Files.exists(file) ? Optional.of(file) : Optional.empty(); return Files.exists(file) ? Optional.of(file) : Optional.empty();
} catch (Exception ex) { } catch (Exception ex) {
@ -84,7 +84,7 @@ public class BeaconServer {
if (System.getProperty("os.name").startsWith("Windows")) { if (System.getProperty("os.name").startsWith("Windows")) {
file = Path.of(System.getenv("LOCALAPPDATA"), "X-Pipe", "app", "xpipe.exe"); file = Path.of(System.getenv("LOCALAPPDATA"), "X-Pipe", "app", "xpipe.exe");
} else { } else {
file = Path.of("/opt/xpipe/app/bin/xpipe"); file = Path.of("/opt/xpipe/bin/xpipe");
} }
return Files.exists(file) ? Optional.of(file) : Optional.empty(); return Files.exists(file) ? Optional.of(file) : Optional.empty();
} catch (Exception ex) { } catch (Exception ex) {