From 0c19acdb01cfb45c87af21cd6f30a6a248959120 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Thu, 20 Aug 2026 16:15:11 -0600 Subject: [PATCH] chore: cleanup general pkg vs pkgdist confusion --- internal/classifypkg/classifypkg.go | 28 +++++++++---------- .../variants.go | 0 .../releases/{bun => bundist}/variants.go | 0 .../releases/{cmake => cmakedist}/variants.go | 0 .../releases/{fish => fishdist}/variants.go | 0 .../releases/{git => gitdist}/variants.go | 0 .../releases/{git => gitdist}/versions.go | 0 .../releases/{lsd => lsddist}/variants.go | 0 .../{ollama => ollamadist}/variants.go | 0 .../releases/{pwsh => pwshdist}/variants.go | 0 .../releases/{sass => sassdist}/variants.go | 0 .../releases/{sttr => sttrdist}/variants.go | 0 .../{uuidv7 => uuidv7dist}/variants.go | 0 .../{watchexec => watchexecdist}/variants.go | 0 .../{watchexec => watchexecdist}/versions.go | 0 .../{xcaddy => xcaddydist}/variants.go | 0 internal/releases/{xz => xzdist}/variants.go | 0 17 files changed, 14 insertions(+), 14 deletions(-) rename internal/releases/{atomicparsley => atomicparsleydist}/variants.go (100%) rename internal/releases/{bun => bundist}/variants.go (100%) rename internal/releases/{cmake => cmakedist}/variants.go (100%) rename internal/releases/{fish => fishdist}/variants.go (100%) rename internal/releases/{git => gitdist}/variants.go (100%) rename internal/releases/{git => gitdist}/versions.go (100%) rename internal/releases/{lsd => lsddist}/variants.go (100%) rename internal/releases/{ollama => ollamadist}/variants.go (100%) rename internal/releases/{pwsh => pwshdist}/variants.go (100%) rename internal/releases/{sass => sassdist}/variants.go (100%) rename internal/releases/{sttr => sttrdist}/variants.go (100%) rename internal/releases/{uuidv7 => uuidv7dist}/variants.go (100%) rename internal/releases/{watchexec => watchexecdist}/variants.go (100%) rename internal/releases/{watchexec => watchexecdist}/versions.go (100%) rename internal/releases/{xcaddy => xcaddydist}/variants.go (100%) rename internal/releases/{xz => xzdist}/variants.go (100%) diff --git a/internal/classifypkg/classifypkg.go b/internal/classifypkg/classifypkg.go index 899e855..4e2b2ec 100644 --- a/internal/classifypkg/classifypkg.go +++ b/internal/classifypkg/classifypkg.go @@ -20,31 +20,31 @@ import ( "github.com/webinstall/webi-installers/internal/classify" "github.com/webinstall/webi-installers/internal/installerconf" "github.com/webinstall/webi-installers/internal/rawcache" - atomicparsleydist "github.com/webinstall/webi-installers/internal/releases/atomicparsley" - bundist "github.com/webinstall/webi-installers/internal/releases/bun" + "github.com/webinstall/webi-installers/internal/releases/atomicparsleydist" + "github.com/webinstall/webi-installers/internal/releases/bundist" "github.com/webinstall/webi-installers/internal/releases/chromedist" - cmakedist "github.com/webinstall/webi-installers/internal/releases/cmake" - fishdist "github.com/webinstall/webi-installers/internal/releases/fish" + "github.com/webinstall/webi-installers/internal/releases/cmakedist" + "github.com/webinstall/webi-installers/internal/releases/fishdist" "github.com/webinstall/webi-installers/internal/releases/flutterdist" - gitdist "github.com/webinstall/webi-installers/internal/releases/git" + "github.com/webinstall/webi-installers/internal/releases/gitdist" "github.com/webinstall/webi-installers/internal/releases/golang" "github.com/webinstall/webi-installers/internal/releases/gpgdist" "github.com/webinstall/webi-installers/internal/releases/hashicorp" "github.com/webinstall/webi-installers/internal/releases/iterm2dist" "github.com/webinstall/webi-installers/internal/releases/juliadist" - lsddist "github.com/webinstall/webi-installers/internal/releases/lsd" + "github.com/webinstall/webi-installers/internal/releases/lsddist" "github.com/webinstall/webi-installers/internal/releases/mariadbdist" "github.com/webinstall/webi-installers/internal/releases/nodedist" - ollamadist "github.com/webinstall/webi-installers/internal/releases/ollama" + "github.com/webinstall/webi-installers/internal/releases/ollamadist" "github.com/webinstall/webi-installers/internal/releases/postgres" - pwshdist "github.com/webinstall/webi-installers/internal/releases/pwsh" - sassdist "github.com/webinstall/webi-installers/internal/releases/sass" + "github.com/webinstall/webi-installers/internal/releases/pwshdist" + "github.com/webinstall/webi-installers/internal/releases/sassdist" "github.com/webinstall/webi-installers/internal/releases/servicemandist" - sttrdist "github.com/webinstall/webi-installers/internal/releases/sttr" - uuidv7dist "github.com/webinstall/webi-installers/internal/releases/uuidv7" - watchexecdist "github.com/webinstall/webi-installers/internal/releases/watchexec" - xcaddydist "github.com/webinstall/webi-installers/internal/releases/xcaddy" - xzdist "github.com/webinstall/webi-installers/internal/releases/xz" + "github.com/webinstall/webi-installers/internal/releases/sttrdist" + "github.com/webinstall/webi-installers/internal/releases/uuidv7dist" + "github.com/webinstall/webi-installers/internal/releases/watchexecdist" + "github.com/webinstall/webi-installers/internal/releases/xcaddydist" + "github.com/webinstall/webi-installers/internal/releases/xzdist" "github.com/webinstall/webi-installers/internal/releases/zigdist" "github.com/webinstall/webi-installers/internal/storage" ) diff --git a/internal/releases/atomicparsley/variants.go b/internal/releases/atomicparsleydist/variants.go similarity index 100% rename from internal/releases/atomicparsley/variants.go rename to internal/releases/atomicparsleydist/variants.go diff --git a/internal/releases/bun/variants.go b/internal/releases/bundist/variants.go similarity index 100% rename from internal/releases/bun/variants.go rename to internal/releases/bundist/variants.go diff --git a/internal/releases/cmake/variants.go b/internal/releases/cmakedist/variants.go similarity index 100% rename from internal/releases/cmake/variants.go rename to internal/releases/cmakedist/variants.go diff --git a/internal/releases/fish/variants.go b/internal/releases/fishdist/variants.go similarity index 100% rename from internal/releases/fish/variants.go rename to internal/releases/fishdist/variants.go diff --git a/internal/releases/git/variants.go b/internal/releases/gitdist/variants.go similarity index 100% rename from internal/releases/git/variants.go rename to internal/releases/gitdist/variants.go diff --git a/internal/releases/git/versions.go b/internal/releases/gitdist/versions.go similarity index 100% rename from internal/releases/git/versions.go rename to internal/releases/gitdist/versions.go diff --git a/internal/releases/lsd/variants.go b/internal/releases/lsddist/variants.go similarity index 100% rename from internal/releases/lsd/variants.go rename to internal/releases/lsddist/variants.go diff --git a/internal/releases/ollama/variants.go b/internal/releases/ollamadist/variants.go similarity index 100% rename from internal/releases/ollama/variants.go rename to internal/releases/ollamadist/variants.go diff --git a/internal/releases/pwsh/variants.go b/internal/releases/pwshdist/variants.go similarity index 100% rename from internal/releases/pwsh/variants.go rename to internal/releases/pwshdist/variants.go diff --git a/internal/releases/sass/variants.go b/internal/releases/sassdist/variants.go similarity index 100% rename from internal/releases/sass/variants.go rename to internal/releases/sassdist/variants.go diff --git a/internal/releases/sttr/variants.go b/internal/releases/sttrdist/variants.go similarity index 100% rename from internal/releases/sttr/variants.go rename to internal/releases/sttrdist/variants.go diff --git a/internal/releases/uuidv7/variants.go b/internal/releases/uuidv7dist/variants.go similarity index 100% rename from internal/releases/uuidv7/variants.go rename to internal/releases/uuidv7dist/variants.go diff --git a/internal/releases/watchexec/variants.go b/internal/releases/watchexecdist/variants.go similarity index 100% rename from internal/releases/watchexec/variants.go rename to internal/releases/watchexecdist/variants.go diff --git a/internal/releases/watchexec/versions.go b/internal/releases/watchexecdist/versions.go similarity index 100% rename from internal/releases/watchexec/versions.go rename to internal/releases/watchexecdist/versions.go diff --git a/internal/releases/xcaddy/variants.go b/internal/releases/xcaddydist/variants.go similarity index 100% rename from internal/releases/xcaddy/variants.go rename to internal/releases/xcaddydist/variants.go diff --git a/internal/releases/xz/variants.go b/internal/releases/xzdist/variants.go similarity index 100% rename from internal/releases/xz/variants.go rename to internal/releases/xzdist/variants.go