Fixed version extraction logic in installer.

shannah · Jan 15, 2022 · c1b0ef5 · c1b0ef5
1 parent e615f26
commit c1b0ef5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/installer/src/main/java/ca/weblite/jdeploy/installer/Main.java b/installer/src/main/java/ca/weblite/jdeploy/installer/Main.java
@@ -309,7 +309,7 @@ private static String extractVersionFromFileName(String fileName) {
         if (pos < 0) return null;
 
         fileName = fileName.substring(0, pos);
-        Pattern p = Pattern.compile("\\-(\\d.*)$");
+        Pattern p = Pattern.compile("^.*?-(\\d.*)$");
         Matcher m = p.matcher(fileName);
         if (m.matches()) {
             return m.group(1);
@@ -405,6 +405,7 @@ private File findInstallFilesDir(File startDir) {
             String version = extractVersionFromFileName(appBundle.getName());
             if (version == null) {
                 System.err.println("Cannot download bundle info from network because the version string was not found in the app name: "+appBundle.getName());
+                return null;
             }
             try {
                 return downloadJDeployBundleForCode(code, version);