From 28b36bdd61566cb12cd1928aa9867a1c0a9170fa Mon Sep 17 00:00:00 2001 From: LukeGus Date: Sun, 26 Oct 2025 23:35:39 -0500 Subject: [PATCH] fix: rename choco package --- .github/workflows/electron-build.yml | 19 +++++++++---------- PACKAGE_MANAGERS.md | 12 ++++-------- PACKAGE_SUBMISSION_SUMMARY.md | 12 +++++++----- .../{termix.nuspec => termix-ssh.nuspec} | 4 ++-- chocolatey/tools/chocolateyinstall.ps1 | 2 +- chocolatey/tools/chocolateyuninstall.ps1 | 2 +- 6 files changed, 24 insertions(+), 27 deletions(-) rename chocolatey/{termix.nuspec => termix-ssh.nuspec} (96%) diff --git a/.github/workflows/electron-build.yml b/.github/workflows/electron-build.yml index 6f3408c5..a86d22df 100644 --- a/.github/workflows/electron-build.yml +++ b/.github/workflows/electron-build.yml @@ -607,9 +607,9 @@ jobs: [System.IO.File]::WriteAllText("$PWD\choco-build\tools\chocolateyinstall.ps1", $installScript, [System.Text.UTF8Encoding]::new($false)) # Update nuspec with version (preserve UTF-8 encoding without BOM) - $nuspec = Get-Content "choco-build\termix.nuspec" -Raw -Encoding UTF8 + $nuspec = Get-Content "choco-build\termix-ssh.nuspec" -Raw -Encoding UTF8 $nuspec = $nuspec -replace 'VERSION_PLACEHOLDER', $VERSION - [System.IO.File]::WriteAllText("$PWD\choco-build\termix.nuspec", $nuspec, [System.Text.UTF8Encoding]::new($false)) + [System.IO.File]::WriteAllText("$PWD\choco-build\termix-ssh.nuspec", $nuspec, [System.Text.UTF8Encoding]::new($false)) echo "Chocolatey package prepared for version $VERSION" echo "Download URL: $DOWNLOAD_URL" @@ -617,7 +617,7 @@ jobs: # Verify the nuspec is valid echo "" echo "Verifying nuspec content:" - Get-Content "choco-build\termix.nuspec" -Head 10 + Get-Content "choco-build\termix-ssh.nuspec" -Head 10 echo "" - name: Install Chocolatey @@ -630,7 +630,7 @@ jobs: run: | cd choco-build echo "Packing Chocolatey package..." - choco pack termix.nuspec + choco pack termix-ssh.nuspec if ($LASTEXITCODE -ne 0) { echo "❌ Failed to pack Chocolatey package" @@ -662,11 +662,11 @@ jobs: choco apikey --key "${{ secrets.CHOCOLATEY_API_KEY }}" --source https://push.chocolatey.org/ try { - choco push "termix.$VERSION.nupkg" --source https://push.chocolatey.org/ + choco push "termix-ssh.$VERSION.nupkg" --source https://push.chocolatey.org/ if ($LASTEXITCODE -eq 0) { echo "" echo "✅ Package pushed to Chocolatey successfully!" - echo "View at: https://community.chocolatey.org/packages/termix/$VERSION" + echo "View at: https://community.chocolatey.org/packages/termix-ssh/$VERSION" } else { throw "Chocolatey push failed with exit code $LASTEXITCODE" } @@ -675,15 +675,14 @@ jobs: echo "❌ Failed to push to Chocolatey" echo "" echo "Common reasons:" - echo "1. Package ID 'termix' is already owned by another user" + echo "1. Package ID 'termix-ssh' is already owned by another user" echo "2. You need to register/claim the package ID first" echo "3. API key doesn't have push permissions" echo "" echo "Solutions:" - echo "1. Check if package exists: https://community.chocolatey.org/packages/termix" + echo "1. Check if package exists: https://community.chocolatey.org/packages/termix-ssh" echo "2. If it exists and is yours, contact Chocolatey support to claim it" - echo "3. If owned by someone else, use a different package ID (e.g., 'termix-ssh')" - echo "4. Register a new package ID at: https://community.chocolatey.org/" + echo "3. Register a new package ID at: https://community.chocolatey.org/" echo "" echo "The package artifact has been saved for manual submission." echo "" diff --git a/PACKAGE_MANAGERS.md b/PACKAGE_MANAGERS.md index d4eea6e5..5bb8c0d2 100644 --- a/PACKAGE_MANAGERS.md +++ b/PACKAGE_MANAGERS.md @@ -29,25 +29,21 @@ Add your Chocolatey API key as a GitHub secret: - Secret name: `CHOCOLATEY_API_KEY` - Get your API key from: https://community.chocolatey.org/account -**Important:** The package ID "termix" must be registered/owned by you on Chocolatey. If you get a 403 error: - -1. Check if the package exists: https://community.chocolatey.org/packages/termix -2. If taken by someone else, change the package ID in `chocolatey/termix.nuspec` (e.g., to "termix-ssh") -3. See `chocolatey/TROUBLESHOOTING.md` for detailed solutions +**Note:** The package ID is set to "termix-ssh" to avoid conflicts with existing packages. ### Manual Submission If you prefer to submit manually: 1. Download the `chocolatey-package` artifact from GitHub Actions -2. Run: `choco push termix.{VERSION}.nupkg --source https://push.chocolatey.org/` +2. Run: `choco push termix-ssh.{VERSION}.nupkg --source https://push.chocolatey.org/` ### Installation (for users) Once approved on Chocolatey: ```powershell -choco install termix +choco install termix-ssh ``` --- @@ -335,7 +331,7 @@ For issues with: ```powershell # Chocolatey (after approval) -choco install termix +choco install termix-ssh ``` ### Linux diff --git a/PACKAGE_SUBMISSION_SUMMARY.md b/PACKAGE_SUBMISSION_SUMMARY.md index cd6ed35f..579f7204 100644 --- a/PACKAGE_SUBMISSION_SUMMARY.md +++ b/PACKAGE_SUBMISSION_SUMMARY.md @@ -102,6 +102,8 @@ Add GitHub secret to enable automatic submission: - **Get from**: https://community.chocolatey.org/account - **Location**: Repository Settings → Secrets and variables → Actions +**Note:** Package ID is "termix-ssh" + ### Flatpak (Manual) No secrets required. Process: @@ -218,8 +220,8 @@ These are already configured in `electron-builder.json`. ```powershell cd chocolatey -choco pack termix.nuspec -choco install termix -s . -y +choco pack termix-ssh.nuspec +choco install termix-ssh -s . -y ``` ### Flatpak @@ -244,7 +246,7 @@ Once approved on all platforms: ```bash # Windows (Chocolatey) -choco install termix +choco install termix-ssh # Linux (Flatpak) flatpak install flathub com.karmaa.termix @@ -262,7 +264,7 @@ brew install --cask termix ### Chocolatey - Updates pushed automatically when you run workflow with "submit" -- Users update with: `choco upgrade termix` +- Users update with: `choco upgrade termix-ssh` ### Flatpak @@ -295,7 +297,7 @@ brew install --cask termix For issues: - **Build/Workflow**: https://github.com/Termix-SSH/Termix/issues -- **Chocolatey**: https://community.chocolatey.org/packages/termix +- **Chocolatey**: https://community.chocolatey.org/packages/termix-ssh - **Flatpak**: https://github.com/flathub/com.karmaa.termix/issues - **Homebrew**: https://github.com/Homebrew/homebrew-cask/issues (or your custom tap) diff --git a/chocolatey/termix.nuspec b/chocolatey/termix-ssh.nuspec similarity index 96% rename from chocolatey/termix.nuspec rename to chocolatey/termix-ssh.nuspec index 45f5aec1..cba8f817 100644 --- a/chocolatey/termix.nuspec +++ b/chocolatey/termix-ssh.nuspec @@ -1,11 +1,11 @@ - termix + termix-ssh VERSION_PLACEHOLDER https://github.com/Termix-SSH/Termix bugattiguy527 - Termix + Termix SSH bugattiguy527 https://github.com/Termix-SSH/Termix https://raw.githubusercontent.com/Termix-SSH/Termix/main/public/icon.png diff --git a/chocolatey/tools/chocolateyinstall.ps1 b/chocolatey/tools/chocolateyinstall.ps1 index c7c6f0f2..c2335167 100644 --- a/chocolatey/tools/chocolateyinstall.ps1 +++ b/chocolatey/tools/chocolateyinstall.ps1 @@ -1,6 +1,6 @@ $ErrorActionPreference = 'Stop' -$packageName = 'termix' +$packageName = 'termix-ssh' $toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" $url64 = 'DOWNLOAD_URL_PLACEHOLDER' $checksum64 = 'CHECKSUM_PLACEHOLDER' diff --git a/chocolatey/tools/chocolateyuninstall.ps1 b/chocolatey/tools/chocolateyuninstall.ps1 index 0c29bac0..95457b73 100644 --- a/chocolatey/tools/chocolateyuninstall.ps1 +++ b/chocolatey/tools/chocolateyuninstall.ps1 @@ -1,6 +1,6 @@ $ErrorActionPreference = 'Stop' -$packageName = 'termix' +$packageName = 'termix-ssh' $softwareName = 'Termix*' $installerType = 'msi'