From 70a6fc6afe9f3aecac7d0b501e4dc814d97c174b Mon Sep 17 00:00:00 2001 From: Aaron Martell Date: Wed, 9 Sep 2026 15:11:23 -0500 Subject: [PATCH 1/2] bug: fixed v2 release resolving --- README.md | 2 +- cmd/create.go | 4 ++-- cmd/create_test.go | 6 +++--- cmd/hooks.go | 4 ++-- cmd/root.go | 2 +- cmd/root_test.go | 4 ++-- go.mod | 2 +- internal/bootstrapper/bootstrapper.go | 2 +- internal/bootstrapper/bootstrapper_test.go | 4 ++-- internal/filemanager/filemanager.go | 2 +- internal/filemanager/filemanager_test.go | 2 +- internal/fs/filesystem.go | 2 +- internal/fs/filesystem_test.go | 4 ++-- internal/git/git.go | 2 +- internal/git/git_test.go | 4 ++-- internal/gitboundary/gitboundary_test.go | 2 +- internal/hooks/hooks.go | 2 +- internal/hooks/hooks_test.go | 4 ++-- internal/lnkerror/error_test.go | 2 +- internal/patterns/patterns_test.go | 2 +- internal/resolver/resolver_test.go | 2 +- internal/scope/scope_test.go | 2 +- internal/testhelpers/helpers.go | 4 ++-- internal/tracker/tracker_test.go | 2 +- main.go | 2 +- service/add.go | 6 +++--- service/add_test.go | 6 +++--- service/bootstrap.go | 2 +- service/bootstrap_test.go | 4 ++-- service/create.go | 8 ++++---- service/create_test.go | 8 ++++---- service/doctor.go | 8 ++++---- service/doctor_project_test.go | 4 ++-- service/doctor_test.go | 4 ++-- service/format.go | 6 +++--- service/format_test.go | 4 ++-- service/hooks.go | 2 +- service/hooks_test.go | 4 ++-- service/init.go | 4 ++-- service/init_test.go | 6 +++--- service/integration.go | 6 +++--- service/integration_test.go | 4 ++-- service/list.go | 4 ++-- service/list_test.go | 4 ++-- service/move.go | 6 +++--- service/move_test.go | 2 +- service/project.go | 14 +++++++------- service/project_cache.go | 4 ++-- service/project_cache_test.go | 4 ++-- service/project_test.go | 8 ++++---- service/remove.go | 6 +++--- service/remove_test.go | 4 ++-- service/restore.go | 4 ++-- service/restore_test.go | 4 ++-- service/service.go | 12 ++++++------ service/sync.go | 4 ++-- service/sync_test.go | 6 +++--- tests/integration/dotfile_setup_test.go | 2 +- tests/integration/format_upgrade_test.go | 2 +- tests/integration/hooks_test.go | 6 +++--- tests/integration/multimachine_test.go | 4 ++-- tests/integration/recovery_test.go | 2 +- tests/integration/remove_restore_test.go | 2 +- tests/integration/scope_migration_test.go | 4 ++-- tests/integration/update_test.go | 4 ++-- tools/gen-docs/main.go | 2 +- 66 files changed, 135 insertions(+), 135 deletions(-) diff --git a/README.md b/README.md index bb5ef57..4a9cec2 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ curl -sSL https://raw.githubusercontent.com/polymorcodeus/lnk/main/install.sh | Or grab a binary from [releases](https://github.com/polymorcodeus/lnk/releases), or build from source: ```bash -go install github.com/polymorcodeus/lnk@latest +go install github.com/polymorcodeus/lnk/v2@latest ``` *NOTE:* diff --git a/cmd/create.go b/cmd/create.go index 8129145..01d8fb7 100644 --- a/cmd/create.go +++ b/cmd/create.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/service" ) // newCreateCmd returns the "create" subcommand. diff --git a/cmd/create_test.go b/cmd/create_test.go index faace20..1ec97f6 100644 --- a/cmd/create_test.go +++ b/cmd/create_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/cmd" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/cmd" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" ) func TestCreateCmd_MixedFileAndDir(t *testing.T) { diff --git a/cmd/hooks.go b/cmd/hooks.go index 9954caa..0db05bf 100644 --- a/cmd/hooks.go +++ b/cmd/hooks.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" - "github.com/polymorcodeus/lnk/internal/gitboundary" - "github.com/polymorcodeus/lnk/internal/hooks" + "github.com/polymorcodeus/lnk/v2/internal/gitboundary" + "github.com/polymorcodeus/lnk/v2/internal/hooks" ) // newHooksCmd returns the "hooks" command group. diff --git a/cmd/root.go b/cmd/root.go index ce0f8e8..9aaa13e 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/service" ) var ( diff --git a/cmd/root_test.go b/cmd/root_test.go index 8e5b8f6..b05baf2 100644 --- a/cmd/root_test.go +++ b/cmd/root_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/cmd" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/cmd" + "github.com/polymorcodeus/lnk/v2/service" ) func TestPrintRestore(t *testing.T) { diff --git a/go.mod b/go.mod index 8349bdd..cd350f2 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/polymorcodeus/lnk +module github.com/polymorcodeus/lnk/v2 go 1.26 diff --git a/internal/bootstrapper/bootstrapper.go b/internal/bootstrapper/bootstrapper.go index f6c19d7..464666e 100644 --- a/internal/bootstrapper/bootstrapper.go +++ b/internal/bootstrapper/bootstrapper.go @@ -8,7 +8,7 @@ import ( "os/exec" "path/filepath" - "github.com/polymorcodeus/lnk/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" ) type commandRunner func(ctx context.Context, name string, arg ...string) *exec.Cmd diff --git a/internal/bootstrapper/bootstrapper_test.go b/internal/bootstrapper/bootstrapper_test.go index 5ffa522..289fba7 100644 --- a/internal/bootstrapper/bootstrapper_test.go +++ b/internal/bootstrapper/bootstrapper_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/internal/bootstrapper" - "github.com/polymorcodeus/lnk/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/bootstrapper" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" ) // --- stubs --- diff --git a/internal/filemanager/filemanager.go b/internal/filemanager/filemanager.go index b6d8cde..59e4d79 100644 --- a/internal/filemanager/filemanager.go +++ b/internal/filemanager/filemanager.go @@ -7,7 +7,7 @@ import ( "path/filepath" "slices" - "github.com/polymorcodeus/lnk/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" ) type fileSystem interface { diff --git a/internal/filemanager/filemanager_test.go b/internal/filemanager/filemanager_test.go index 7c8d813..3152a0b 100644 --- a/internal/filemanager/filemanager_test.go +++ b/internal/filemanager/filemanager_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/polymorcodeus/lnk/internal/filemanager" + "github.com/polymorcodeus/lnk/v2/internal/filemanager" ) // ---------- fakes ---------- diff --git a/internal/fs/filesystem.go b/internal/fs/filesystem.go index 8981f66..fa7ef01 100644 --- a/internal/fs/filesystem.go +++ b/internal/fs/filesystem.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - "github.com/polymorcodeus/lnk/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" ) // Sentinel errors for file system operations. diff --git a/internal/fs/filesystem_test.go b/internal/fs/filesystem_test.go index bb15561..dc7cbd8 100644 --- a/internal/fs/filesystem_test.go +++ b/internal/fs/filesystem_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/fs" - "github.com/polymorcodeus/lnk/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/fs" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" ) func TestFileSystem_ValidateFileInfoForAdd(t *testing.T) { diff --git a/internal/git/git.go b/internal/git/git.go index 7f9ceae..e195fb7 100644 --- a/internal/git/git.go +++ b/internal/git/git.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/polymorcodeus/lnk/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" ) // Sentinel errors for git operations. diff --git a/internal/git/git_test.go b/internal/git/git_test.go index fc87030..0832730 100644 --- a/internal/git/git_test.go +++ b/internal/git/git_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/internal/git" - "github.com/polymorcodeus/lnk/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/internal/git" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" ) // ---------- helpers ---------- diff --git a/internal/gitboundary/gitboundary_test.go b/internal/gitboundary/gitboundary_test.go index 3cbe7dc..de6f2bb 100644 --- a/internal/gitboundary/gitboundary_test.go +++ b/internal/gitboundary/gitboundary_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/gitboundary" + "github.com/polymorcodeus/lnk/v2/internal/gitboundary" ) func initGitRepo(t *testing.T, dir string) { diff --git a/internal/hooks/hooks.go b/internal/hooks/hooks.go index ca89f2f..c1dd5aa 100644 --- a/internal/hooks/hooks.go +++ b/internal/hooks/hooks.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/polymorcodeus/lnk/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" ) // Marker comments bracket a hook script written by lnk. diff --git a/internal/hooks/hooks_test.go b/internal/hooks/hooks_test.go index 7e2aed1..35f40b4 100644 --- a/internal/hooks/hooks_test.go +++ b/internal/hooks/hooks_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/internal/hooks" - "github.com/polymorcodeus/lnk/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/hooks" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" ) func TestInstallLnkRepo_WritesPostMergeHook(t *testing.T) { diff --git a/internal/lnkerror/error_test.go b/internal/lnkerror/error_test.go index 70c1d26..639031b 100644 --- a/internal/lnkerror/error_test.go +++ b/internal/lnkerror/error_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - "github.com/polymorcodeus/lnk/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" ) func TestSentinels(t *testing.T) { diff --git a/internal/patterns/patterns_test.go b/internal/patterns/patterns_test.go index 999b324..dee8fae 100644 --- a/internal/patterns/patterns_test.go +++ b/internal/patterns/patterns_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/patterns" + "github.com/polymorcodeus/lnk/v2/internal/patterns" ) func TestLoad_MissingFile(t *testing.T) { diff --git a/internal/resolver/resolver_test.go b/internal/resolver/resolver_test.go index a871578..558145b 100644 --- a/internal/resolver/resolver_test.go +++ b/internal/resolver/resolver_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/internal/resolver" + "github.com/polymorcodeus/lnk/v2/internal/resolver" ) func TestNormalizeRemoteURL(t *testing.T) { diff --git a/internal/scope/scope_test.go b/internal/scope/scope_test.go index 28a1dab..ea43b17 100644 --- a/internal/scope/scope_test.go +++ b/internal/scope/scope_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/internal/scope" + "github.com/polymorcodeus/lnk/v2/internal/scope" ) func TestHomeRelativeResolver_ToStorage(t *testing.T) { diff --git a/internal/testhelpers/helpers.go b/internal/testhelpers/helpers.go index c8939e2..1c279f6 100644 --- a/internal/testhelpers/helpers.go +++ b/internal/testhelpers/helpers.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/internal/tracker" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/tracker" + "github.com/polymorcodeus/lnk/v2/service" ) // ---------- Repo setup helpers ---------- diff --git a/internal/tracker/tracker_test.go b/internal/tracker/tracker_test.go index 5b9f3bb..7798f5b 100644 --- a/internal/tracker/tracker_test.go +++ b/internal/tracker/tracker_test.go @@ -7,7 +7,7 @@ import ( "slices" "testing" - "github.com/polymorcodeus/lnk/internal/tracker" + "github.com/polymorcodeus/lnk/v2/internal/tracker" ) func TestTracker_LnkFileName(t *testing.T) { diff --git a/main.go b/main.go index 75a2a89..a8fd805 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import ( _ "embed" "strings" - "github.com/polymorcodeus/lnk/cmd" + "github.com/polymorcodeus/lnk/v2/cmd" ) //go:embed VERSION diff --git a/service/add.go b/service/add.go index ad2dbda..c6a2f3f 100644 --- a/service/add.go +++ b/service/add.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - "github.com/polymorcodeus/lnk/internal/filemanager" - "github.com/polymorcodeus/lnk/internal/gitboundary" - "github.com/polymorcodeus/lnk/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/filemanager" + "github.com/polymorcodeus/lnk/v2/internal/gitboundary" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" ) // Add tracks one or more paths in common or one host scope. diff --git a/service/add_test.go b/service/add_test.go index 919a1b5..f1b29ea 100644 --- a/service/add_test.go +++ b/service/add_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/fs" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/internal/fs" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" ) // ---------- Add tests ---------- diff --git a/service/bootstrap.go b/service/bootstrap.go index 8720786..177e34c 100644 --- a/service/bootstrap.go +++ b/service/bootstrap.go @@ -4,7 +4,7 @@ import ( "context" "io" - bootpkg "github.com/polymorcodeus/lnk/internal/bootstrapper" + bootpkg "github.com/polymorcodeus/lnk/v2/internal/bootstrapper" ) // Bootstrap runs bootstrap.sh explicitly. diff --git a/service/bootstrap_test.go b/service/bootstrap_test.go index 6723e38..deeb54e 100644 --- a/service/bootstrap_test.go +++ b/service/bootstrap_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/testhelpers" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/service" ) // ---------- Bootstrap tests ---------- diff --git a/service/create.go b/service/create.go index e2f31d3..a3d38a1 100644 --- a/service/create.go +++ b/service/create.go @@ -8,10 +8,10 @@ import ( "path/filepath" "strings" - "github.com/polymorcodeus/lnk/internal/filemanager" - "github.com/polymorcodeus/lnk/internal/fs" - "github.com/polymorcodeus/lnk/internal/gitboundary" - "github.com/polymorcodeus/lnk/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/filemanager" + "github.com/polymorcodeus/lnk/v2/internal/fs" + "github.com/polymorcodeus/lnk/v2/internal/gitboundary" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" ) const lnkKeepFileName = ".lnkkeep" diff --git a/service/create_test.go b/service/create_test.go index eef6dcb..4f2b101 100644 --- a/service/create_test.go +++ b/service/create_test.go @@ -7,10 +7,10 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/fs" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/testhelpers" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/fs" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/service" ) // ---------- Success cases ---------- diff --git a/service/doctor.go b/service/doctor.go index 6ee03be..721e531 100644 --- a/service/doctor.go +++ b/service/doctor.go @@ -10,10 +10,10 @@ import ( "slices" "strings" - "github.com/polymorcodeus/lnk/internal/fs" - "github.com/polymorcodeus/lnk/internal/gitboundary" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/tracker" + "github.com/polymorcodeus/lnk/v2/internal/fs" + "github.com/polymorcodeus/lnk/v2/internal/gitboundary" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/tracker" ) // ScopeResult captures doctor findings for one profile or storage scope. diff --git a/service/doctor_project_test.go b/service/doctor_project_test.go index b749809..4b9e007 100644 --- a/service/doctor_project_test.go +++ b/service/doctor_project_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/internal/testhelpers" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/service" ) func TestDoctor_ProjectIssues_OrphanedStorage(t *testing.T) { diff --git a/service/doctor_test.go b/service/doctor_test.go index 4ee2767..4bb19a2 100644 --- a/service/doctor_test.go +++ b/service/doctor_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" ) // ---------- Doctor scan tests ---------- diff --git a/service/format.go b/service/format.go index a5a1d87..cbf64ca 100644 --- a/service/format.go +++ b/service/format.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - fspkg "github.com/polymorcodeus/lnk/internal/fs" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/tracker" + fspkg "github.com/polymorcodeus/lnk/v2/internal/fs" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/tracker" ) // commonPath describes both legacy and v2 paths for commonScope diff --git a/service/format_test.go b/service/format_test.go index bc07177..203e2d3 100644 --- a/service/format_test.go +++ b/service/format_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/internal/testhelpers" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/service" ) // setupV2Repo creates a v2 repo with a set of tracked files ready for format diff --git a/service/hooks.go b/service/hooks.go index 1258785..23cb442 100644 --- a/service/hooks.go +++ b/service/hooks.go @@ -7,7 +7,7 @@ import ( "os" "time" - "github.com/polymorcodeus/lnk/internal/gitboundary" + "github.com/polymorcodeus/lnk/v2/internal/gitboundary" ) // hookTimeout limits how long a hook body may block the git operation. diff --git a/service/hooks_test.go b/service/hooks_test.go index d16c60d..aca81ec 100644 --- a/service/hooks_test.go +++ b/service/hooks_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/testhelpers" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/service" ) func TestRestoreHook_CreatesMissingAndReportsCollisions(t *testing.T) { diff --git a/service/init.go b/service/init.go index c10305d..e5e26c5 100644 --- a/service/init.go +++ b/service/init.go @@ -6,8 +6,8 @@ import ( "io" "os" - bootpkg "github.com/polymorcodeus/lnk/internal/bootstrapper" - "github.com/polymorcodeus/lnk/internal/lnkerror" + bootpkg "github.com/polymorcodeus/lnk/v2/internal/bootstrapper" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" ) // Init creates a new local repo when needed. diff --git a/service/init_test.go b/service/init_test.go index f49945d..39201fc 100644 --- a/service/init_test.go +++ b/service/init_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/testhelpers" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/service" ) // ---------- Init tests ---------- diff --git a/service/integration.go b/service/integration.go index cfe8856..de94b69 100644 --- a/service/integration.go +++ b/service/integration.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "github.com/polymorcodeus/lnk/internal/gitboundary" - "github.com/polymorcodeus/lnk/internal/resolver" - "github.com/polymorcodeus/lnk/internal/scope" + "github.com/polymorcodeus/lnk/v2/internal/gitboundary" + "github.com/polymorcodeus/lnk/v2/internal/resolver" + "github.com/polymorcodeus/lnk/v2/internal/scope" ) // DetectProjectScope checks if dir (or the current working directory when dir diff --git a/service/integration_test.go b/service/integration_test.go index 5e8d54c..eb54fc8 100644 --- a/service/integration_test.go +++ b/service/integration_test.go @@ -8,8 +8,8 @@ import ( "slices" "testing" - "github.com/polymorcodeus/lnk/internal/testhelpers" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/service" ) func TestDetectProjectScope_OutsideGitRepo(t *testing.T) { diff --git a/service/list.go b/service/list.go index 1b05a2f..3ec252b 100644 --- a/service/list.go +++ b/service/list.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/tracker" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/tracker" ) // List returns tracked items for common, one host, or all storage scopes. diff --git a/service/list_test.go b/service/list_test.go index 44c0eb2..e338f8b 100644 --- a/service/list_test.go +++ b/service/list_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/internal/testhelpers" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/service" ) // ---------- List tests ---------- diff --git a/service/move.go b/service/move.go index 8b3d030..7156906 100644 --- a/service/move.go +++ b/service/move.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - fspkg "github.com/polymorcodeus/lnk/internal/fs" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/tracker" + fspkg "github.com/polymorcodeus/lnk/v2/internal/fs" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/tracker" ) // Move transfers ownership of a tracked path between scopes. diff --git a/service/move_test.go b/service/move_test.go index 2b9b36b..7077b59 100644 --- a/service/move_test.go +++ b/service/move_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" ) // ---------- Move tests ---------- diff --git a/service/project.go b/service/project.go index d0fce6a..e87c7bd 100644 --- a/service/project.go +++ b/service/project.go @@ -10,13 +10,13 @@ import ( "slices" "strings" - fspkg "github.com/polymorcodeus/lnk/internal/fs" - gitpkg "github.com/polymorcodeus/lnk/internal/git" - "github.com/polymorcodeus/lnk/internal/gitboundary" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/patterns" - "github.com/polymorcodeus/lnk/internal/resolver" - "github.com/polymorcodeus/lnk/internal/scope" + fspkg "github.com/polymorcodeus/lnk/v2/internal/fs" + gitpkg "github.com/polymorcodeus/lnk/v2/internal/git" + "github.com/polymorcodeus/lnk/v2/internal/gitboundary" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/patterns" + "github.com/polymorcodeus/lnk/v2/internal/resolver" + "github.com/polymorcodeus/lnk/v2/internal/scope" ) // ProjectService implements project-scope operations for the lnk repo diff --git a/service/project_cache.go b/service/project_cache.go index 7f7c902..1f1a523 100644 --- a/service/project_cache.go +++ b/service/project_cache.go @@ -10,8 +10,8 @@ import ( "slices" "strings" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/resolver" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/resolver" ) // projectCacheFile is the machine-local mapping from stored project IDs to diff --git a/service/project_cache_test.go b/service/project_cache_test.go index 8d03d38..43926a4 100644 --- a/service/project_cache_test.go +++ b/service/project_cache_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/testhelpers" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/service" ) func TestProjectCache_LoadSaveAndGetSetRemove(t *testing.T) { diff --git a/service/project_test.go b/service/project_test.go index e99a342..f2d5e5e 100644 --- a/service/project_test.go +++ b/service/project_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/resolver" - "github.com/polymorcodeus/lnk/internal/testhelpers" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/resolver" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/service" ) func initProjectRepo(t *testing.T, dir string) { diff --git a/service/remove.go b/service/remove.go index f97db80..22aed0e 100644 --- a/service/remove.go +++ b/service/remove.go @@ -7,9 +7,9 @@ import ( "path/filepath" "slices" - "github.com/polymorcodeus/lnk/internal/filemanager" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/tracker" + "github.com/polymorcodeus/lnk/v2/internal/filemanager" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/tracker" ) // Remove stops managing a path and restores it to the current machine. diff --git a/service/remove_test.go b/service/remove_test.go index 375bd79..b0faa66 100644 --- a/service/remove_test.go +++ b/service/remove_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" ) // setupTrackedFile builds the on-disk state for a tracked file without going diff --git a/service/restore.go b/service/restore.go index 7335804..6d525c5 100644 --- a/service/restore.go +++ b/service/restore.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - fspkg "github.com/polymorcodeus/lnk/internal/fs" - "github.com/polymorcodeus/lnk/internal/lnkerror" + fspkg "github.com/polymorcodeus/lnk/v2/internal/fs" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" ) // Restore applies the effective machine profile: common only, or common + host. diff --git a/service/restore_test.go b/service/restore_test.go index a46996b..c5e36cd 100644 --- a/service/restore_test.go +++ b/service/restore_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" ) // ---------- Restore tests ---------- diff --git a/service/service.go b/service/service.go index 9ba9817..90e5e43 100644 --- a/service/service.go +++ b/service/service.go @@ -11,12 +11,12 @@ import ( "slices" "strings" - filemgr "github.com/polymorcodeus/lnk/internal/filemanager" - fspkg "github.com/polymorcodeus/lnk/internal/fs" - gitpkg "github.com/polymorcodeus/lnk/internal/git" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/scope" - "github.com/polymorcodeus/lnk/internal/tracker" + filemgr "github.com/polymorcodeus/lnk/v2/internal/filemanager" + fspkg "github.com/polymorcodeus/lnk/v2/internal/fs" + gitpkg "github.com/polymorcodeus/lnk/v2/internal/git" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/scope" + "github.com/polymorcodeus/lnk/v2/internal/tracker" ) const ( diff --git a/service/sync.go b/service/sync.go index 99e674b..408d612 100644 --- a/service/sync.go +++ b/service/sync.go @@ -3,8 +3,8 @@ package service import ( "context" - gitpkg "github.com/polymorcodeus/lnk/internal/git" - "github.com/polymorcodeus/lnk/internal/lnkerror" + gitpkg "github.com/polymorcodeus/lnk/v2/internal/git" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" ) // Commit stages all repo changes and creates a commit. diff --git a/service/sync_test.go b/service/sync_test.go index 7d3d1b0..f7a836c 100644 --- a/service/sync_test.go +++ b/service/sync_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/internal/lnkerror" - "github.com/polymorcodeus/lnk/internal/testhelpers" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/lnkerror" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/service" ) // pushAndClone sets up a bare remote, pushes an initial lnk commit, then diff --git a/tests/integration/dotfile_setup_test.go b/tests/integration/dotfile_setup_test.go index 5e43923..fbdbc0a 100644 --- a/tests/integration/dotfile_setup_test.go +++ b/tests/integration/dotfile_setup_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" ) // TestIntegration_FullDotfileSetup simulates a user setting up lnk for the diff --git a/tests/integration/format_upgrade_test.go b/tests/integration/format_upgrade_test.go index d2f5412..f0954d4 100644 --- a/tests/integration/format_upgrade_test.go +++ b/tests/integration/format_upgrade_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" ) // TestIntegration_FormatUpgrade simulates the full round-trip format migration: diff --git a/tests/integration/hooks_test.go b/tests/integration/hooks_test.go index 5d7b768..e2febf2 100644 --- a/tests/integration/hooks_test.go +++ b/tests/integration/hooks_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "github.com/polymorcodeus/lnk/internal/hooks" - "github.com/polymorcodeus/lnk/internal/testhelpers" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/hooks" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/service" ) // TestIntegration_HookPostCheckout_RestoresMissingSymlinks verifies that the diff --git a/tests/integration/multimachine_test.go b/tests/integration/multimachine_test.go index 083e0d0..4578d50 100644 --- a/tests/integration/multimachine_test.go +++ b/tests/integration/multimachine_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/testhelpers" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/service" ) // TestIntegration_MultiMachine simulates the primary use case of lnk across diff --git a/tests/integration/recovery_test.go b/tests/integration/recovery_test.go index b554b95..e1011b0 100644 --- a/tests/integration/recovery_test.go +++ b/tests/integration/recovery_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" ) // TestIntegration_Recovery simulates two broken symlink scenarios — accidental diff --git a/tests/integration/remove_restore_test.go b/tests/integration/remove_restore_test.go index 7a7dea8..3c12bc7 100644 --- a/tests/integration/remove_restore_test.go +++ b/tests/integration/remove_restore_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" ) // TestIntegration_RemoveRestoreCycle simulates a user removing a tracked file diff --git a/tests/integration/scope_migration_test.go b/tests/integration/scope_migration_test.go index 9bcd8a3..b9ca462 100644 --- a/tests/integration/scope_migration_test.go +++ b/tests/integration/scope_migration_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/testhelpers" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/service" ) // TestIntegration_ScopeMigration simulates a user moving tracked files between diff --git a/tests/integration/update_test.go b/tests/integration/update_test.go index f6d6f8f..e858b74 100644 --- a/tests/integration/update_test.go +++ b/tests/integration/update_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "github.com/polymorcodeus/lnk/internal/testhelpers" - "github.com/polymorcodeus/lnk/service" + "github.com/polymorcodeus/lnk/v2/internal/testhelpers" + "github.com/polymorcodeus/lnk/v2/service" ) // TestIntegration_Update simulates the core lnk update workflow: a second diff --git a/tools/gen-docs/main.go b/tools/gen-docs/main.go index dc73389..8e5c681 100644 --- a/tools/gen-docs/main.go +++ b/tools/gen-docs/main.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra/doc" - "github.com/polymorcodeus/lnk/cmd" + "github.com/polymorcodeus/lnk/v2/cmd" ) func main() { From 8a158c5dd7946fac792c5139dbf2fc66a1d9d1d9 Mon Sep 17 00:00:00 2001 From: Aaron Martell Date: Wed, 9 Sep 2026 15:12:36 -0500 Subject: [PATCH 2/2] chore: version bump --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 8721bbc..a372120 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.4.0 +v2.4.1