Move -fx suffix after distribution name (e.g., zulu-fx instead of fx-zulu)

Co-authored-by: bytemain <13938334+bytemain@users.noreply.github.com>

Author: Copilot

README.md

@@ -9,7 +9,7 @@ Support for multiple JDK distributions, such as: Oracle, Graalvm, Eclipse & more
 
 # Usage
 
-**Parameter Format**: `x.y.z-distribution` or `x.y.z-fx-distribution` (for JavaFX bundled versions)
+**Parameter Format**: `x.y.z-distribution` or `x.y.z-distribution-fx` (for JavaFX bundled versions)
 
 ```shell
 # add plugin for vfox
@@ -21,9 +21,9 @@ vfox install java@17.0.17-tem      # Temurin
 vfox install java@17.0.17-zulu     # Zulu
 vfox install java@17-graal         # GraalVM (latest 17.x)
 
-# install JavaFX bundled versions (use -fx suffix)
-vfox install java@21.0.5-fx-zulu   # Zulu with JavaFX
-vfox install java@21.0.5-fx-librca # Liberica with JavaFX
+# install JavaFX bundled versions (use -fx suffix after distribution)
+vfox install java@21.0.5-zulu-fx   # Zulu with JavaFX
+vfox install java@21.0.5-librca-fx # Liberica with JavaFX
 
 # view all available versions
 vfox search java           # view all openjdk versions
@@ -34,19 +34,19 @@ vfox search java graal     # view all graalvm versions
 
 ## JavaFX Support
 
-Some distributions provide JDK versions bundled with JavaFX. These versions are displayed with the `-fx` suffix in the version list and marked with "JavaFX" in the notes. To install a JavaFX bundled version, add `-fx` to the version string:
+Some distributions provide JDK versions bundled with JavaFX. These versions are displayed with the `-fx` suffix after the distribution name in the version list and marked with "JavaFX" in the notes. To install a JavaFX bundled version, add `-fx` after the distribution name:
 
 ```shell
 # List versions (JavaFX versions will show -fx suffix)
 vfox search java zulu
 # Example output:
 # 21.0.5-zulu
-# 21.0.5-fx-zulu    # JavaFX
+# 21.0.5-zulu-fx    # JavaFX
 # 17.0.13-zulu
-# 17.0.13-fx-zulu   # JavaFX
+# 17.0.13-zulu-fx   # JavaFX
 
 # Install JavaFX bundled version
-vfox install java@21.0.5-fx-zulu
+vfox install java@21.0.5-zulu-fx
 ```
 
 # Supported JDK Distributions

README_CN.md

@@ -8,7 +8,7 @@
 
 # 使用
 
-**参数格式**:  `x.y.z-distribution` 或 `x.y.z-fx-distribution` (带 JavaFX 的版本)
+**参数格式**:  `x.y.z-distribution` 或 `x.y.z-distribution-fx` (带 JavaFX 的版本)
 
 ```shell
 # 添加插件
@@ -18,9 +18,9 @@ vfox add java
 vfox install java@x.y.z  # 默认使用openjdk
 vfox install java@x.y.z-graal # 使用graalvm
 
-# 安装带 JavaFX 的版本 (使用 -fx 后缀)
-vfox install java@21.0.5-fx-zulu   # 带 JavaFX 的 Zulu
-vfox install java@21.0.5-fx-librca # 带 JavaFX 的 Liberica
+# 安装带 JavaFX 的版本 (在发行版名称后添加 -fx 后缀)
+vfox install java@21.0.5-zulu-fx   # 带 JavaFX 的 Zulu
+vfox install java@21.0.5-librca-fx # 带 JavaFX 的 Liberica
 
 # 查看所有可用版本
 vfox search java all # 查看所有sdk版本
@@ -30,19 +30,19 @@ vfox search java graal # 查看所有graalvm版本
 
 ## JavaFX 支持
 
-部分发行版提供了捆绑 JavaFX 的 JDK 版本。这些版本在版本列表中会显示 `-fx` 后缀，并在备注中标注 "JavaFX"。安装带 JavaFX 的版本时，需要在版本字符串中添加 `-fx`：
+部分发行版提供了捆绑 JavaFX 的 JDK 版本。这些版本在版本列表中会在发行版名称后显示 `-fx` 后缀，并在备注中标注 "JavaFX"。安装带 JavaFX 的版本时，需要在发行版名称后添加 `-fx`：
 
 ```shell
 # 查看版本列表 (带 JavaFX 的版本会显示 -fx 后缀)
 vfox search java zulu
 # 示例输出:
 # 21.0.5-zulu
-# 21.0.5-fx-zulu    # JavaFX
+# 21.0.5-zulu-fx    # JavaFX
 # 17.0.13-zulu
-# 17.0.13-fx-zulu   # JavaFX
+# 17.0.13-zulu-fx   # JavaFX
 
 # 安装带 JavaFX 的版本
-vfox install java@21.0.5-fx-zulu
+vfox install java@21.0.5-zulu-fx
 ```
 
 # 支持的JDK发行版

hooks/available.lua

@@ -31,18 +31,18 @@ function PLUGIN:Available(ctx)
         local v = jdk.java_version
         local short = jdk.short
 
-        -- Add -fx suffix for JavaFX bundled versions
+        -- Add -fx suffix for JavaFX bundled versions (after distribution name)
         local fx_suffix = ""
         if jdk.javafx_bundled == true then
             fx_suffix = "-fx"
         end
 
         if query == "all" then
-            v = v .. fx_suffix .. "-" .. short
+            v = v .. "-" .. short .. fx_suffix
         elseif query == "open" then
             v = v .. fx_suffix
         else
-            v = v .. fx_suffix .. "-" .. distribution.short_name
+            v = v .. "-" .. distribution.short_name .. fx_suffix
         end
 
         if not seen[v] then

hooks/pre_install.lua

@@ -40,7 +40,7 @@ function PLUGIN:PreInstall(ctx)
     --     checksum = httpGet(info.checksum_uri, "Failed to fetch checksum")
     -- end
 
-    -- Build final version string with fx suffix if needed
+    -- Build final version string with fx suffix if needed (after distribution name)
     local fx_suffix = ""
     if jdk.javafx_bundled == true then
         fx_suffix = "-fx"
@@ -50,7 +50,7 @@ function PLUGIN:PreInstall(ctx)
     if distribution_version.distribution.short_name == "open" then
         finalV = jdk.java_version .. fx_suffix
     else
-        finalV = jdk.java_version .. fx_suffix .. "-" .. distribution_version.distribution.short_name
+        finalV = jdk.java_version .. "-" .. distribution_version.distribution.short_name .. fx_suffix
     end
     return {
         -- [info.checksum_type] = checksum,

lib/distribution_version.lua

@@ -61,16 +61,11 @@ function distribution_version.parse_version (arg)
     local distribution
     local javafx_bundled = false
 
-    -- Check for "fx" in any part and remove it, setting javafx_bundled flag
-    local filtered_parts = {}
-    for _, part in ipairs(version_parts) do
-        if part == "fx" then
-            javafx_bundled = true
-        else
-            table.insert(filtered_parts, part)
-        end
+    -- Check if the last part is "fx" and remove it, setting javafx_bundled flag
+    if version_parts[#version_parts] == "fx" then
+        javafx_bundled = true
+        table.remove(version_parts)
     end
-    version_parts = filtered_parts
 
     if not version_parts[2] then
         -- no parts, check if we got a distribution name without version