Root properties fix

qzind · Apr 10, 2021 · 48c1f4a · tresf · Apr 10, 2021 · 48c1f4a
1 parent fd5fdc1
commit 48c1f4a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 20 deletions.
diff --git a/ant/apple/installer.xml b/ant/apple/installer.xml
@@ -67,7 +67,6 @@
         -->
 
         <!-- payload/Contents/ -->
-        <mkdir dir="${build.dir}/scripts/payload/Resources"/>
         <copy todir="${build.dir}/scripts/payload/Contents">
             <fileset dir="${dist.dir}"/>
         </copy>

diff --git a/src/qz/common/SecurityInfo.java b/src/qz/common/SecurityInfo.java
@@ -90,7 +90,7 @@ public static SortedMap<String,String> getLibVersions() {
             Method method = VersionInfo.getMethod("getVersion");
             Object version = method.invoke(null);
             libVersions.put("javafx", (String)version);
-            if (fxPath.contains(SystemUtilities.detectJarPath()) || fxPath.contains("/tray/")) {
+            if (fxPath.contains(SystemUtilities.getJarPath()) || fxPath.contains("/tray/")) {
                 libVersions.put("javafx (location)", "Bundled/" + Constants.ABOUT_TITLE);
             } else {
                 libVersions.put("javafx (location)", "System/" + Constants.JAVA_VENDOR);

diff --git a/src/qz/installer/MacInstaller.java b/src/qz/installer/MacInstaller.java
@@ -146,6 +146,7 @@ public Installer removeLegacyStartup() {
         return this;
     }
 
+    //fixme: overlaps systemUtilities.getAppPath
     public static String getAppPath() {
         // Return the Mac ".app" location
         String target = SystemUtilities.getJarPath();

diff --git a/src/qz/installer/certificate/CertificateManager.java b/src/qz/installer/certificate/CertificateManager.java
@@ -329,7 +329,7 @@ public static File getWritableLocation(String ... subDirs) throws IOException {
 
         if (subDirs.length == 0) {
             // Assume root directory is next to jar (e.g. qz-tray.properties)
-            Path appPath = SystemUtilities.detectAppPath();
+            Path appPath = Paths.get(SystemUtilities.getJarPath()).getParent();
             // Handle null path, such as running from IDE
             if(appPath != null) {
                 locs.add(appPath);

diff --git a/src/qz/installer/shortcut/WindowsShortcutCreator.java b/src/qz/installer/shortcut/WindowsShortcutCreator.java
@@ -45,6 +45,7 @@ private void createShortcut(String folderPath) {
 
     /**
      * Calculates .exe path from .jar
+     * fixme: overlaps SystemUtilities.getAppPath
      */
     private static String getAppPath() {
         return SystemUtilities.getJarPath().replaceAll(".jar$", ".exe");

diff --git a/src/qz/printer/action/WebApp.java b/src/qz/printer/action/WebApp.java
@@ -159,7 +159,7 @@ public static synchronized void initialize() throws IOException {
             if (Constants.JAVA_VERSION.greaterThanOrEqualTo(Version.valueOf("11.0.0"))) {
                 // JavaFX native libs
                 if (SystemUtilities.isJar()) {
-                    SystemUtilities.appendProperty("java.library.path", new File(SystemUtilities.detectJarPath()).getParent() + "/libs/");
+                    SystemUtilities.appendProperty("java.library.path", new File(SystemUtilities.getJarPath()).getParent() + "/libs/");
                 } else if (hasConflictingLib()) {
                     // IDE helper for "no suitable pipeline found" errors
                     System.err.println("\n=== WARNING ===\nWrong javafx platform detected. Delete lib/javafx/<platform> to correct this.\n");

diff --git a/src/qz/utils/SystemUtilities.java b/src/qz/utils/SystemUtilities.java
@@ -156,30 +156,22 @@ public static Version getJavaVersion(String version) {
 
     /**
      * Determines the currently running Jar's absolute path on the local filesystem
+     * todo: make this return a sane directory for running via ide
      *
      * @return A String value representing the absolute path to the currently running
      * jar
      */
-    public static String detectJarPath() {
+    public static String getJarPath() {
+        if (jarPath != null) {
+            return jarPath;
+        }
         try {
-            String jarPath = new File(SystemUtilities.class.getProtectionDomain().getCodeSource().getLocation().getPath()).getCanonicalPath();
+            String path = new File(SystemUtilities.class.getProtectionDomain().getCodeSource().getLocation().getPath()).getCanonicalPath();
             // Fix characters that get URL encoded when calling getPath()
-            return URLDecoder.decode(jarPath, "UTF-8");
+            jarPath = URLDecoder.decode(path, "UTF-8");
         } catch(IOException ex) {
             log.error("Unable to determine Jar path", ex);
         }
-        return null;
-    }
-
-    /**
-     * Returns the jar which we will create a shortcut for
-     *
-     * @return The path to the jar path which has been set
-     */
-    public static String getJarPath() {
-        if (jarPath == null) {
-            jarPath = detectJarPath();
-        }
         return jarPath;
     }
 
@@ -189,7 +181,7 @@ public static String getJarPath() {
      * @return
      */
     public static Path detectAppPath() {
-        String jarPath = detectJarPath();
+        String jarPath = getJarPath();
         if (jarPath != null) {
             File jar = new File(jarPath);
             if (jar.getPath().endsWith(".jar") && jar.exists()) {