From 9fc4409a18fb74eb0229b7966d68e3cfa511781b Mon Sep 17 00:00:00 2001 From: Jacob Date: Wed, 3 Dec 2025 16:01:57 +0000 Subject: [PATCH] fix(oneclient): change build templates to say oneclient and not onelauncher (#416) --- apps/oneclient/desktop/tauri.conf.json | 4 +-- apps/oneclient/distribution/aur/cli/PKGBUILD | 10 +++---- apps/oneclient/distribution/aur/gui/PKGBUILD | 26 ++++++++--------- apps/oneclient/distribution/brew/oneclient.rb | 28 +++++++++++++++++++ .../distribution/brew/onelauncher.rb | 28 ------------------- ...uncher.desktop => org.polyfrost.oneclient} | 8 +++--- ...l => org.polyfrost.oneclient.metainfo.xml} | 0 ...uncher.yml => org.polyfrost.oneclient.yml} | 0 ...plate => org.polyfrost.oneclient.template} | 2 +- .../{onelauncher.json => oneclient.json} | 10 +++---- .../winget/Polyfrost.OneClient.installer.yaml | 4 +-- .../Polyfrost.OneClient.locale.en-US.yaml | 4 +-- .../winget/Polyfrost.OneClient.yaml | 2 +- 13 files changed, 63 insertions(+), 63 deletions(-) create mode 100644 apps/oneclient/distribution/brew/oneclient.rb delete mode 100644 apps/oneclient/distribution/brew/onelauncher.rb rename apps/oneclient/distribution/flatpak/{org.polyfrost.launcher.desktop => org.polyfrost.oneclient} (67%) rename apps/oneclient/distribution/flatpak/{org.polyfrost.launcher.metainfo.xml => org.polyfrost.oneclient.metainfo.xml} (100%) rename apps/oneclient/distribution/flatpak/{org.polyfrost.launcher.yml => org.polyfrost.oneclient.yml} (100%) rename apps/oneclient/distribution/linux/{org.polyfrost.launcher.desktop.template => org.polyfrost.oneclient.template} (93%) rename apps/oneclient/distribution/scoop/{onelauncher.json => oneclient.json} (53%) diff --git a/apps/oneclient/desktop/tauri.conf.json b/apps/oneclient/desktop/tauri.conf.json index 4ef2340e..c3b6dc9c 100644 --- a/apps/oneclient/desktop/tauri.conf.json +++ b/apps/oneclient/desktop/tauri.conf.json @@ -72,10 +72,10 @@ "linux": { "deb": { "depends": [], - "desktopTemplate": "../distribution/linux/org.polyfrost.launcher.desktop.template" + "desktopTemplate": "../distribution/linux/org.polyfrost.oneclient.template" }, "rpm": { - "desktopTemplate": "../distribution/linux/org.polyfrost.launcher.desktop.template" + "desktopTemplate": "../distribution/linux/org.polyfrost.oneclient.template" }, "appimage": { diff --git a/apps/oneclient/distribution/aur/cli/PKGBUILD b/apps/oneclient/distribution/aur/cli/PKGBUILD index 281b42e3..457dea05 100644 --- a/apps/oneclient/distribution/aur/cli/PKGBUILD +++ b/apps/oneclient/distribution/aur/cli/PKGBUILD @@ -1,8 +1,8 @@ -pkgname=onelauncher-bin +pkgname=oneclient-bin pkgver=0.1.0 pkgrel=2 pkgdesc='Next-generation open source Minecraft launcher' -url='https://polyfrost.org/launcher' +url='https://polyfrost.org/projects/oneclient' arch=('x86_64') license=('GPL3') @@ -14,9 +14,9 @@ depends=( optdepends=( 'xorg-xrandr: very legacy minecraft versions' ) -provides=('onelauncher') -conflicts=('onelauncher') -source=("https://launcher.polyfrost.org/versions/${pkgver}/linux/onelauncher_${pkgver}_amd64.deb") +provides=('oneclient') +conflicts=('oneclient') +source=("https://oneclient.polyfrost.org/versions/${pkgver}/linux/OneClient_${pkgver}_amd64.deb") sha256sums=('') build() { diff --git a/apps/oneclient/distribution/aur/gui/PKGBUILD b/apps/oneclient/distribution/aur/gui/PKGBUILD index d1975f4e..5ba85981 100644 --- a/apps/oneclient/distribution/aur/gui/PKGBUILD +++ b/apps/oneclient/distribution/aur/gui/PKGBUILD @@ -1,8 +1,8 @@ -pkgname=onelauncher +pkgname=oneclient pkgver=0.1.0 pkgrel=2 pkgdesc='Next-generation open source Minecraft launcher' -url='https://polyfrost.org/launcher' +url='https://polyfrost.org/projects/oneclient' arch=('x86_64') license=('GPL3') @@ -14,37 +14,37 @@ depends=( optdepends=( 'xorg-xrandr: very legacy minecraft versions' ) -conflicts=('onelauncher-bin') +conflicts=('oneclient-bin') source=( - "$pkgname-$pkgver.tar.gz:https://github.com/polyfrost/onelauncher/archive/refs/tags/v${pkgver}.tar.gz" - "onelauncher.desktop" + "$pkgname-$pkgver.tar.gz:https://github.com/polyfrost/oneclient/archive/refs/tags/v${pkgver}.tar.gz" + "oneclient.desktop" ) sha256sums=('') options=('!lto') prepare() { - cd "onelauncher-${pkgver}" + cd "oneclient-${pkgver}" export RUSTUP_TOOLCHAIN=stable cargo fetch --locked --target "$CARCH-unknown-linux-gnu" pnpm install --frozen-lockfile --no-optional } build() { - cd "onelauncher-${pkgver}" - pnpm --filter @onelauncher/gui build + cd "oneclient-${pkgver}" + pnpm --filter @oneclient/gui build export RUSTUP_TOOLCHAIN=stable cargo build --frozen --release --all-features } check() { - cd "onelauncher-${pkgver}" + cd "oneclient-${pkgver}" export RUSTUP_TOOLCHAIN=stable cargo test --frozen --all-features } package() { - install -Dm755 "$srcdir"/onelauncher-"$pkgver"/target/release/onelauncher_gui "$pkgdir"/usr/bin/onelauncher - install -Dm644 "$srcdir"/onelauncher-"$pkgver"/packages/distribution/icons/128x128.png "$pkgdir"/usr/share/icons/hicolor/128x128/apps/OneLauncher.png - install -Dm644 "$srcdir"/onelauncher-"$pkgver"/packages/distribution/icons/icon.png "$pkgdir"/usr/share/icons/hicolor/256x256@2/apps/OneLauncher.png - install -Dm644 OneLauncher.desktop "$pkgdir"/usr/share/applications/OneLauncher.desktop + install -Dm755 "$srcdir"/oneclient-"$pkgver"/target/release/oneclient_gui "$pkgdir"/usr/bin/oneclient + install -Dm644 "$srcdir"/oneclient-"$pkgver"/packages/distribution/icons/128x128.png "$pkgdir"/usr/share/icons/hicolor/128x128/apps/OneClient.png + install -Dm644 "$srcdir"/oneclient-"$pkgver"/packages/distribution/icons/icon.png "$pkgdir"/usr/share/icons/hicolor/256x256@2/apps/OneClient.png + install -Dm644 OneClient.desktop "$pkgdir"/usr/share/applications/OneClient.desktop } diff --git a/apps/oneclient/distribution/brew/oneclient.rb b/apps/oneclient/distribution/brew/oneclient.rb new file mode 100644 index 00000000..de3276e8 --- /dev/null +++ b/apps/oneclient/distribution/brew/oneclient.rb @@ -0,0 +1,28 @@ +cask "oneclient" do + version "0.1.0" + sha256 "" + + url "https://oneclient.polyfrost.org/versions/#{version}/macos/OneClient_#{version}_universal.dmg" + name "OneClient" + desc "Next-generation open source Minecraft launcher" + homepage "https://polyfrost.org" + + livecheck do + url "https://polyfrost.org/projects/oneclient" + regex("/OneClient[._-]v(\d+(?:\.\d+)+)[._-]universal\.dmg/i") + end + + auto_updated true + depends_on macos: ">= :high_sierra" + + app "OneClient.app" + + uninstall quit: "OneClient" + + zap trash: [ + "~/Library/Application Support/OneClient", + "~/Library/Caches/OneClient", + "~/Library/Saved Application State/OneClient.savedState", + "~/Library/WebKit/OneClient", + ] +end diff --git a/apps/oneclient/distribution/brew/onelauncher.rb b/apps/oneclient/distribution/brew/onelauncher.rb deleted file mode 100644 index f0d995a2..00000000 --- a/apps/oneclient/distribution/brew/onelauncher.rb +++ /dev/null @@ -1,28 +0,0 @@ -cask "onelauncher" do - version "0.1.0" - sha256 "" - - url "https://launcher.polyfrost.org/versions/#{version}/macos/OneLauncher_#{version}_universal.dmg" - name "OneLauncher" - desc "Next-generation open source Minecraft launcher" - homepage "https://polyfrost.org" - - livecheck do - url "https://polyfrost.org/launcher" - regex("/OneLauncher[._-]v(\d+(?:\.\d+)+)[._-]universal\.dmg/i") - end - - auto_updated true - depends_on macos: ">= :high_sierra" - - app "OneLauncher.app" - - uninstall quit: "OneLauncher" - - zap trash: [ - "~/Library/Application Support/OneLauncher", - "~/Library/Caches/OneLauncher", - "~/Library/Saved Application State/OneLauncher.savedState", - "~/Library/WebKit/OneLauncher", - ] -end diff --git a/apps/oneclient/distribution/flatpak/org.polyfrost.launcher.desktop b/apps/oneclient/distribution/flatpak/org.polyfrost.oneclient similarity index 67% rename from apps/oneclient/distribution/flatpak/org.polyfrost.launcher.desktop rename to apps/oneclient/distribution/flatpak/org.polyfrost.oneclient index ce1428e7..51ee7c08 100644 --- a/apps/oneclient/distribution/flatpak/org.polyfrost.launcher.desktop +++ b/apps/oneclient/distribution/flatpak/org.polyfrost.oneclient @@ -1,12 +1,12 @@ [Desktop Entry] -Name=OneLauncher +Name=OneClient Comment=Next-generation open source Minecraft launcher -Exec=onelauncher -Icon=org.polyfrost.launcher +Exec=oneclient +Icon=org.polyfrost.client Type=Application Terminal=false StartupNotify=true Categories=Game; Keywords=game;launcher;mc;minecraft; -StartupWMClass=OneLauncher +StartupWMClass=OneClient Version=1.4 diff --git a/apps/oneclient/distribution/flatpak/org.polyfrost.launcher.metainfo.xml b/apps/oneclient/distribution/flatpak/org.polyfrost.oneclient.metainfo.xml similarity index 100% rename from apps/oneclient/distribution/flatpak/org.polyfrost.launcher.metainfo.xml rename to apps/oneclient/distribution/flatpak/org.polyfrost.oneclient.metainfo.xml diff --git a/apps/oneclient/distribution/flatpak/org.polyfrost.launcher.yml b/apps/oneclient/distribution/flatpak/org.polyfrost.oneclient.yml similarity index 100% rename from apps/oneclient/distribution/flatpak/org.polyfrost.launcher.yml rename to apps/oneclient/distribution/flatpak/org.polyfrost.oneclient.yml diff --git a/apps/oneclient/distribution/linux/org.polyfrost.launcher.desktop.template b/apps/oneclient/distribution/linux/org.polyfrost.oneclient.template similarity index 93% rename from apps/oneclient/distribution/linux/org.polyfrost.launcher.desktop.template rename to apps/oneclient/distribution/linux/org.polyfrost.oneclient.template index 7ab2d6d3..e43eb2ad 100644 --- a/apps/oneclient/distribution/linux/org.polyfrost.launcher.desktop.template +++ b/apps/oneclient/distribution/linux/org.polyfrost.oneclient.template @@ -1,5 +1,5 @@ [Desktop Entry] -Name=OneLauncher +Name=OneClient Comment=Next-generation open source Minecraft launcher Exec={{exec}} Icon={{icon}} diff --git a/apps/oneclient/distribution/scoop/onelauncher.json b/apps/oneclient/distribution/scoop/oneclient.json similarity index 53% rename from apps/oneclient/distribution/scoop/onelauncher.json rename to apps/oneclient/distribution/scoop/oneclient.json index 73bddd53..ba176038 100644 --- a/apps/oneclient/distribution/scoop/onelauncher.json +++ b/apps/oneclient/distribution/scoop/oneclient.json @@ -1,18 +1,18 @@ { "version": "0.1.0", - "homepage": "https://polyfrost.org/launcher", + "homepage": "https://polyfrost.org/projects/oneclient", "description": "Next-generation open source Minecraft launcher", "license": "GPL-3.0-only", "architecture": { "64bit": { - "url": "https://launcher.polyfrost.org/versions/0.1.0/windows/OneLauncher_0.1.0_x64_en-US.msi", + "url": "https://oneclient.polyfrost.org/versions/0.1.0/windows/OneClient_0.1.0_x64_en-US.msi", "hash": "hhjgskdfghskfdlafjdshjadlk" } }, "shortcuts": [ [ - "PFiles\\OneLauncher\\OneLauncher.exe", - "OneLauncher" + "PFiles\\OneClient\\OneClient.exe", + "OneClient" ] ], "checkver": { @@ -21,7 +21,7 @@ "autoupdat": { "architecture": { "64bit": { - "url": "https://launcher.polyfrost.org/versions/$version/windows/OneLauncher_$version_x64_en-US.msi" + "url": "https://oneclient.polyfrost.org/versions/$version/windows/OneClient_$version_x64_en-US.msi" } } } diff --git a/apps/oneclient/distribution/winget/Polyfrost.OneClient.installer.yaml b/apps/oneclient/distribution/winget/Polyfrost.OneClient.installer.yaml index cfcc69e1..538ccbfc 100644 --- a/apps/oneclient/distribution/winget/Polyfrost.OneClient.installer.yaml +++ b/apps/oneclient/distribution/winget/Polyfrost.OneClient.installer.yaml @@ -1,13 +1,13 @@ # yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.5.0.schema.json -PackageIdentifier: Polyfrost.OneLauncher +PackageIdentifier: Polyfrost.OneClient PackageVersion: 0.1.0 InstallerLocale: en-US InstallerType: wix ProductCode: '{}' Installers: - Architecture: x64 - InstallerUrl: https://launcher.polyfrost.org/versions/0.1.0/windows/OneLauncher_0.1.0_x64_en-US.msi + InstallerUrl: https://oneclient.polyfrost.org/versions/0.1.0/windows/OneClient_0.1.0_x64_en-US.msi InstallerSha256: '1111111111111111111111111111318274823726424624666666666666666666666666666666661111E1235666' ManifestType: installer ManifestVersion: 1.5.0 diff --git a/apps/oneclient/distribution/winget/Polyfrost.OneClient.locale.en-US.yaml b/apps/oneclient/distribution/winget/Polyfrost.OneClient.locale.en-US.yaml index 603f13ab..7958e7f6 100644 --- a/apps/oneclient/distribution/winget/Polyfrost.OneClient.locale.en-US.yaml +++ b/apps/oneclient/distribution/winget/Polyfrost.OneClient.locale.en-US.yaml @@ -1,10 +1,10 @@ # yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.5.0.schema.json -PackageIdentifier: Polyfrost.OneLauncher +PackageIdentifier: Polyfrost.OneClient PackageVersion: 0.1.0 PackageLocale: en-US Publisher: Polyfrost -PackageName: OneLauncher +PackageName: OneClient License: GPL-3.0 ShortDescription: Next-generation open source Minecraft launcher ManifestType: defaultLocale diff --git a/apps/oneclient/distribution/winget/Polyfrost.OneClient.yaml b/apps/oneclient/distribution/winget/Polyfrost.OneClient.yaml index 09889a9c..1c14ba0f 100644 --- a/apps/oneclient/distribution/winget/Polyfrost.OneClient.yaml +++ b/apps/oneclient/distribution/winget/Polyfrost.OneClient.yaml @@ -1,6 +1,6 @@ # yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.5.0.schema.json -PackageIdentifier: Polyfrost.OneLauncher +PackageIdentifier: Polyfrost.OneClient PackageVersion: 0.1.0 DefaultLocale: en-US ManifestType: version