From 548f52e11702326e74474a8dd8ef25f814e81fd9 Mon Sep 17 00:00:00 2001 From: Mohammad Durrani <46766905+mdurrani808@users.noreply.github.com> Date: Mon, 26 Dec 2022 21:40:36 -0500 Subject: [PATCH] Allow JAR update/restart on all linux platforms (#651) * Added linux support * Changed to just check linux --- .../org/photonvision/common/hardware/HardwareManager.java | 2 +- .../main/java/org/photonvision/server/RequestHandler.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/photon-core/src/main/java/org/photonvision/common/hardware/HardwareManager.java b/photon-core/src/main/java/org/photonvision/common/hardware/HardwareManager.java index 554c6e6bd..de8ddd4ae 100644 --- a/photon-core/src/main/java/org/photonvision/common/hardware/HardwareManager.java +++ b/photon-core/src/main/java/org/photonvision/common/hardware/HardwareManager.java @@ -126,7 +126,7 @@ public class HardwareManager { } public boolean restartDevice() { - if (Platform.isRaspberryPi()) { + if (Platform.isLinux()) { try { return shellExec.executeBashCommand("reboot now") == 0; } catch (IOException e) { diff --git a/photon-server/src/main/java/org/photonvision/server/RequestHandler.java b/photon-server/src/main/java/org/photonvision/server/RequestHandler.java index 4bb02e875..e52f6d74e 100644 --- a/photon-server/src/main/java/org/photonvision/server/RequestHandler.java +++ b/photon-server/src/main/java/org/photonvision/server/RequestHandler.java @@ -113,7 +113,7 @@ public class RequestHandler { logger.info("New .jar uploaded successfully."); if (file != null) { - if (Platform.isRaspberryPi()) { + if (Platform.isLinux()) { try { Path filePath = Paths.get(ProgramDirectoryUtilities.getProgramDirectory(), "photonvision.jar"); @@ -140,7 +140,7 @@ public class RequestHandler { } } else { - logger.error("Hot .jar replace currently only supported on Raspberry pi. Ignoring."); + logger.error("Hot .jar replace currently only supported on Linux. Ignoring."); ctx.status(500); } @@ -233,7 +233,7 @@ public class RequestHandler { * an equivalent. */ public static void restartProgramInternal() { - if (Platform.isRaspberryPi()) { + if (Platform.isLinux()) { try { new ShellExec().executeBashCommand("systemctl restart photonvision.service"); } catch (IOException e) {