diff --git a/.github/workflows/flatpak-build.yml b/.github/workflows/flatpak-build.yml index e6f7af6..9ed5738 100644 --- a/.github/workflows/flatpak-build.yml +++ b/.github/workflows/flatpak-build.yml @@ -56,14 +56,9 @@ jobs: - name: Build Flatpak Bundle run: ant create-flatpak - - name: Copy Install Instructions into dist/ - run: cp pkg/flatpak/INSTALL.md dist/INSTALL.md - - name: Upload Flatpak Bundle uses: actions/upload-artifact@v4 with: name: jdiskmark-${{ steps.version.outputs.value }}.flatpak - path: | - dist/*.flatpak - dist/INSTALL.md + path: dist/*.flatpak diff --git a/README.md b/README.md index f94921f..395229d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# JDiskMark v0.6.4 beta (Windows/Mac/Linux) +# JDiskMark v0.7.0 beta (Windows/Mac/Linux) Java Disk Benchmark Utility @@ -43,15 +43,44 @@ Note: the `rpm.version` is similar to the `version` but replaces hyphens with pe ### Flatpak Installer (.flatpak) The flatpak installer is a universal linux package that can be used on many distributions. +Some gaming-oriented distros such as Bazzite or SteamOS have Flatpak and Flathub +pre-configured. -To install download the `jdiskmark-.flatpak` file and run: -`flatpak install --user ./jdiskmark-.flatpak` +#### 1. Add Flathub (if not already configured) -To run: -`flatpak run net.jdiskmark.JDiskMark` +```sh +flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo +``` + +#### 2. Install the required runtime + +JDiskMark depends on the `org.freedesktop.Platform 25.08` runtime. Install it from Flathub: + +```sh +flatpak install --user flathub org.freedesktop.Platform//25.08 +``` + +#### 3. Install JDiskMark -To remove: -`flatpak uninstall net.jdiskmark.JDiskMark` +Download the `jdiskmark-.flatpak` bundle and run: + +```sh +flatpak install --user ./jdiskmark-.flatpak +``` + +#### 4. Run + +Launch JDiskMark from your application menu or the terminal: + +```sh +flatpak run net.jdiskmark.JDiskMark +``` + +#### 5. Uninstall + +```sh +flatpak uninstall net.jdiskmark.JDiskMark +``` ### Zip Archive (.zip) diff --git a/pkg/flatpak/INSTALL.md b/pkg/flatpak/INSTALL.md deleted file mode 100644 index 8c76c0f..0000000 --- a/pkg/flatpak/INSTALL.md +++ /dev/null @@ -1,50 +0,0 @@ -# Installing JDiskMark Flatpak - -## Prerequisites - -Flatpak must be installed on your system. If you are on a gaming-oriented distro such -as Bazzite or SteamOS, Flatpak and Flathub are already configured by default. - -### 1. Add Flathub (if not already configured) - -On Ubuntu / Debian: - -```sh -flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -``` - -### 2. Install the required runtime - -The bundle requires the `org.freedesktop.Platform 25.08` runtime from Flathub. -Install it before installing the bundle: - -```sh -flatpak install --user flathub org.freedesktop.Platform//25.08 -``` - -If prompted to install other dependencies, accept them. - -## Install - -Download `jdiskmark-.flatpak` from the GitHub Actions artifact or release page, then run: - -```sh -flatpak install --user ./jdiskmark-.flatpak -``` - -> **Note:** Do **not** use `flatpak install --from` — that flag is for `.flatpakref` -> reference files, not `.flatpak` bundles, and will produce an error. - -## Run - -After installation, launch JDiskMark from your application menu or from the terminal: - -```sh -flatpak run net.jdiskmark.JDiskMark -``` - -## Uninstall - -```sh -flatpak uninstall net.jdiskmark.JDiskMark -```