diff --git a/chameleon-server/pom.xml b/chameleon-server/pom.xml index bdc1ad0a9..731e19ce5 100644 --- a/chameleon-server/pom.xml +++ b/chameleon-server/pom.xml @@ -6,7 +6,7 @@ org.chameleon-vision.main chameleon-vision - 2.3-RELEASE + 2.3.1-RELEASE diff --git a/chameleon-server/src/main/java/com/chameleonvision/util/ProgramDirectoryUtilities.java b/chameleon-server/src/main/java/com/chameleonvision/util/ProgramDirectoryUtilities.java index 3c415a412..189547406 100644 --- a/chameleon-server/src/main/java/com/chameleonvision/util/ProgramDirectoryUtilities.java +++ b/chameleon-server/src/main/java/com/chameleonvision/util/ProgramDirectoryUtilities.java @@ -3,10 +3,8 @@ package com.chameleonvision.util; import java.io.File; import java.net.URISyntaxException; -public class ProgramDirectoryUtilities -{ - private static String getJarName() - { +public class ProgramDirectoryUtilities { + private static String getJarName() { return new File(ProgramDirectoryUtilities.class.getProtectionDomain() .getCodeSource() .getLocation() @@ -14,33 +12,23 @@ public class ProgramDirectoryUtilities .getName(); } - private static boolean runningFromJAR() - { + private static boolean runningFromJAR() { String jarName = getJarName(); return jarName.contains(".jar"); } - public static String getProgramDirectory() - { - if (runningFromJAR()) - { - if (Platform.isRaspberryPi()) { - return "/boot/chameleon-vision"; - } + public static String getProgramDirectory() { + if (runningFromJAR()) { return getCurrentJARDirectory(); - } else - { + } else { return System.getProperty("user.dir"); } } - private static String getCurrentJARDirectory() - { - try - { + private static String getCurrentJARDirectory() { + try { return new File(ProgramDirectoryUtilities.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath()).getParent(); - } catch (URISyntaxException exception) - { + } catch (URISyntaxException exception) { exception.printStackTrace(); }