From aa00ca483a063ddabc0fba7544a6116750fa66fe Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Tue, 2 May 2023 11:47:21 -0600 Subject: [PATCH 1/3] git-ecosystem migration: remove github ownership references Certain files in the project currently contain direct references to GitHub ownership. In light of the impending migration to the git-ecosystem org and the subsequent open sourcing of this project, these claims do not apply and are being removed. Signed-off-by: Lessley Dennington --- CONTRIBUTING.md | 2 +- LICENSE | 2 +- README.md | 4 ++-- SUPPORT.md | 6 +----- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a2de6d5..2b90554 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ [code-of-conduct]: CODE_OF_CONDUCT.md [commit-guidance]: https://github.blog/2022-06-30-write-better-commits-build-better-projects/ -[compare]: https://github.com/github/git-bundle-server/compare +[compare]: https://github.com/git-ecosystem/git-bundle-server/compare [contributions-under-license]: https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license [github-help]: https://help.github.com [license]: LICENSE diff --git a/LICENSE b/LICENSE index 90410bb..9f7d6eb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ Git Bundle Server -Copyright © GitHub, Inc. and contributors +Copyright © Git Bundle Server contributors MIT License diff --git a/README.md b/README.md index 4d80944..e348a2b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Git Bundle Server -[bundle-uris]: https://github.com/git/git/blob/next/Documentation/technical/bundle-uri.txt +[bundle-uris]: https://git-scm.com/docs/bundle-uri [codeowners]: CODEOWNERS [contributing]: CONTRIBUTING.md [license]: LICENSE @@ -22,7 +22,7 @@ started. > :warning: Installation on Windows is currently unsupported :warning: -[releases]: https://github.com/github/git-bundle-server/releases +[releases]: https://github.com/git-ecosystem/git-bundle-server/releases #### Linux diff --git a/SUPPORT.md b/SUPPORT.md index 2ce047a..adf06ae 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -1,6 +1,6 @@ # Support -[discussion]: https://github.com/github/git-bundle-server/discussions +[discussion]: https://github.com/git-ecosystem/git-bundle-server/discussions ## How to file issues and get help @@ -14,7 +14,3 @@ For help or questions about using this project, please start a - `git-bundle-server` is under active development and maintained by GitHub staff **AND THE COMMUNITY**. We will do our best to respond to support, feature requests, and community questions in a timely manner. - -## GitHub Support Policy - -Support for this project is limited to the resources listed above. From b9caf8fc85859f7402f588abd87e43b76c4d037a Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Tue, 2 May 2023 11:49:14 -0600 Subject: [PATCH 2/3] git-ecosystem migration: update module names Update module names to specify `git-ecosystem` as Git Bundle Server's organization. Signed-off-by: Lessley Dennington --- cmd/git-bundle-server/delete.go | 8 ++++---- cmd/git-bundle-server/init.go | 12 ++++++------ cmd/git-bundle-server/list.go | 10 +++++----- cmd/git-bundle-server/main.go | 6 +++--- cmd/git-bundle-server/repair.go | 10 +++++----- cmd/git-bundle-server/start.go | 8 ++++---- cmd/git-bundle-server/stop.go | 8 ++++---- cmd/git-bundle-server/update-all.go | 12 ++++++------ cmd/git-bundle-server/update.go | 10 +++++----- cmd/git-bundle-server/version.go | 6 +++--- cmd/git-bundle-server/web-server.go | 10 +++++----- cmd/git-bundle-web-server/bundle-server.go | 12 ++++++------ cmd/git-bundle-web-server/main.go | 6 +++--- cmd/utils/container-helpers.go | 14 +++++++------- cmd/utils/container-helpers_test.go | 6 +++--- cmd/utils/cron.go | 6 +++--- go.mod | 2 +- internal/argparse/argparse.go | 2 +- internal/bundles/bundles.go | 8 ++++---- internal/bundles/bundles_test.go | 6 +++--- internal/cmd/command.go | 2 +- internal/cmd/settings.go | 2 +- internal/common/filesystem.go | 2 +- internal/core/cron.go | 8 ++++---- internal/core/funcs_test.go | 2 +- internal/core/repo.go | 6 +++--- internal/core/repo_test.go | 8 ++++---- internal/daemon/daemon.go | 6 +++--- internal/daemon/launchd.go | 8 ++++---- internal/daemon/launchd_test.go | 4 ++-- internal/daemon/shared_test.go | 2 +- internal/daemon/systemd.go | 6 +++--- internal/daemon/systemd_test.go | 4 ++-- internal/git/git.go | 4 ++-- internal/git/git_test.go | 6 +++--- internal/testhelpers/funcs.go | 2 +- internal/testhelpers/mocks.go | 4 ++-- internal/utils/maps_test.go | 2 +- internal/utils/slices_test.go | 2 +- 39 files changed, 121 insertions(+), 121 deletions(-) diff --git a/cmd/git-bundle-server/delete.go b/cmd/git-bundle-server/delete.go index c3233f1..f9bdef9 100644 --- a/cmd/git-bundle-server/delete.go +++ b/cmd/git-bundle-server/delete.go @@ -4,10 +4,10 @@ import ( "context" "os" - "github.com/github/git-bundle-server/cmd/utils" - "github.com/github/git-bundle-server/internal/argparse" - "github.com/github/git-bundle-server/internal/core" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/cmd/utils" + "github.com/git-ecosystem/git-bundle-server/internal/argparse" + "github.com/git-ecosystem/git-bundle-server/internal/core" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) type deleteCmd struct { diff --git a/cmd/git-bundle-server/init.go b/cmd/git-bundle-server/init.go index af860bf..bd207de 100644 --- a/cmd/git-bundle-server/init.go +++ b/cmd/git-bundle-server/init.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/github/git-bundle-server/cmd/utils" - "github.com/github/git-bundle-server/internal/argparse" - "github.com/github/git-bundle-server/internal/bundles" - "github.com/github/git-bundle-server/internal/core" - "github.com/github/git-bundle-server/internal/git" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/cmd/utils" + "github.com/git-ecosystem/git-bundle-server/internal/argparse" + "github.com/git-ecosystem/git-bundle-server/internal/bundles" + "github.com/git-ecosystem/git-bundle-server/internal/core" + "github.com/git-ecosystem/git-bundle-server/internal/git" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) type initCmd struct { diff --git a/cmd/git-bundle-server/list.go b/cmd/git-bundle-server/list.go index 8c28d67..b049428 100644 --- a/cmd/git-bundle-server/list.go +++ b/cmd/git-bundle-server/list.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "github.com/github/git-bundle-server/cmd/utils" - "github.com/github/git-bundle-server/internal/argparse" - "github.com/github/git-bundle-server/internal/core" - "github.com/github/git-bundle-server/internal/git" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/cmd/utils" + "github.com/git-ecosystem/git-bundle-server/internal/argparse" + "github.com/git-ecosystem/git-bundle-server/internal/core" + "github.com/git-ecosystem/git-bundle-server/internal/git" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) type listCmd struct { diff --git a/cmd/git-bundle-server/main.go b/cmd/git-bundle-server/main.go index 5a2fe3f..201f4d6 100644 --- a/cmd/git-bundle-server/main.go +++ b/cmd/git-bundle-server/main.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/github/git-bundle-server/cmd/utils" - "github.com/github/git-bundle-server/internal/argparse" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/cmd/utils" + "github.com/git-ecosystem/git-bundle-server/internal/argparse" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) func all(logger log.TraceLogger) []argparse.Subcommand { diff --git a/cmd/git-bundle-server/repair.go b/cmd/git-bundle-server/repair.go index 12a98c7..932d415 100644 --- a/cmd/git-bundle-server/repair.go +++ b/cmd/git-bundle-server/repair.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/github/git-bundle-server/cmd/utils" - "github.com/github/git-bundle-server/internal/argparse" - "github.com/github/git-bundle-server/internal/core" - "github.com/github/git-bundle-server/internal/log" - typeutils "github.com/github/git-bundle-server/internal/utils" + "github.com/git-ecosystem/git-bundle-server/cmd/utils" + "github.com/git-ecosystem/git-bundle-server/internal/argparse" + "github.com/git-ecosystem/git-bundle-server/internal/core" + "github.com/git-ecosystem/git-bundle-server/internal/log" + typeutils "github.com/git-ecosystem/git-bundle-server/internal/utils" ) type repairCmd struct { diff --git a/cmd/git-bundle-server/start.go b/cmd/git-bundle-server/start.go index 19e6a6b..ce47ff2 100644 --- a/cmd/git-bundle-server/start.go +++ b/cmd/git-bundle-server/start.go @@ -4,10 +4,10 @@ import ( "context" "os" - "github.com/github/git-bundle-server/cmd/utils" - "github.com/github/git-bundle-server/internal/argparse" - "github.com/github/git-bundle-server/internal/core" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/cmd/utils" + "github.com/git-ecosystem/git-bundle-server/internal/argparse" + "github.com/git-ecosystem/git-bundle-server/internal/core" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) type startCmd struct { diff --git a/cmd/git-bundle-server/stop.go b/cmd/git-bundle-server/stop.go index cd66070..9e50c9f 100644 --- a/cmd/git-bundle-server/stop.go +++ b/cmd/git-bundle-server/stop.go @@ -3,10 +3,10 @@ package main import ( "context" - "github.com/github/git-bundle-server/cmd/utils" - "github.com/github/git-bundle-server/internal/argparse" - "github.com/github/git-bundle-server/internal/core" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/cmd/utils" + "github.com/git-ecosystem/git-bundle-server/internal/argparse" + "github.com/git-ecosystem/git-bundle-server/internal/core" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) type stopCmd struct { diff --git a/cmd/git-bundle-server/update-all.go b/cmd/git-bundle-server/update-all.go index 4978ba6..7e029b7 100644 --- a/cmd/git-bundle-server/update-all.go +++ b/cmd/git-bundle-server/update-all.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/github/git-bundle-server/cmd/utils" - "github.com/github/git-bundle-server/internal/argparse" - "github.com/github/git-bundle-server/internal/cmd" - "github.com/github/git-bundle-server/internal/common" - "github.com/github/git-bundle-server/internal/core" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/cmd/utils" + "github.com/git-ecosystem/git-bundle-server/internal/argparse" + "github.com/git-ecosystem/git-bundle-server/internal/cmd" + "github.com/git-ecosystem/git-bundle-server/internal/common" + "github.com/git-ecosystem/git-bundle-server/internal/core" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) type updateAllCmd struct { diff --git a/cmd/git-bundle-server/update.go b/cmd/git-bundle-server/update.go index 6c07b4b..f49f22e 100644 --- a/cmd/git-bundle-server/update.go +++ b/cmd/git-bundle-server/update.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/github/git-bundle-server/cmd/utils" - "github.com/github/git-bundle-server/internal/argparse" - "github.com/github/git-bundle-server/internal/bundles" - "github.com/github/git-bundle-server/internal/core" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/cmd/utils" + "github.com/git-ecosystem/git-bundle-server/internal/argparse" + "github.com/git-ecosystem/git-bundle-server/internal/bundles" + "github.com/git-ecosystem/git-bundle-server/internal/core" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) type updateCmd struct { diff --git a/cmd/git-bundle-server/version.go b/cmd/git-bundle-server/version.go index ff6718a..0d992c6 100644 --- a/cmd/git-bundle-server/version.go +++ b/cmd/git-bundle-server/version.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/github/git-bundle-server/cmd/utils" - "github.com/github/git-bundle-server/internal/argparse" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/cmd/utils" + "github.com/git-ecosystem/git-bundle-server/internal/argparse" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) type versionCmd struct { diff --git a/cmd/git-bundle-server/web-server.go b/cmd/git-bundle-server/web-server.go index 4185e54..6876495 100644 --- a/cmd/git-bundle-server/web-server.go +++ b/cmd/git-bundle-server/web-server.go @@ -6,11 +6,11 @@ import ( "fmt" "path/filepath" - "github.com/github/git-bundle-server/cmd/utils" - "github.com/github/git-bundle-server/internal/argparse" - "github.com/github/git-bundle-server/internal/common" - "github.com/github/git-bundle-server/internal/daemon" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/cmd/utils" + "github.com/git-ecosystem/git-bundle-server/internal/argparse" + "github.com/git-ecosystem/git-bundle-server/internal/common" + "github.com/git-ecosystem/git-bundle-server/internal/daemon" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) type webServerCmd struct { diff --git a/cmd/git-bundle-web-server/bundle-server.go b/cmd/git-bundle-web-server/bundle-server.go index af2784a..0851aa1 100644 --- a/cmd/git-bundle-web-server/bundle-server.go +++ b/cmd/git-bundle-web-server/bundle-server.go @@ -14,12 +14,12 @@ import ( "syscall" "time" - "github.com/github/git-bundle-server/internal/bundles" - "github.com/github/git-bundle-server/internal/cmd" - "github.com/github/git-bundle-server/internal/common" - "github.com/github/git-bundle-server/internal/core" - "github.com/github/git-bundle-server/internal/git" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/internal/bundles" + "github.com/git-ecosystem/git-bundle-server/internal/cmd" + "github.com/git-ecosystem/git-bundle-server/internal/common" + "github.com/git-ecosystem/git-bundle-server/internal/core" + "github.com/git-ecosystem/git-bundle-server/internal/git" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) type bundleWebServer struct { diff --git a/cmd/git-bundle-web-server/main.go b/cmd/git-bundle-web-server/main.go index 7fabfd6..feb1255 100644 --- a/cmd/git-bundle-web-server/main.go +++ b/cmd/git-bundle-web-server/main.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - "github.com/github/git-bundle-server/cmd/utils" - "github.com/github/git-bundle-server/internal/argparse" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/cmd/utils" + "github.com/git-ecosystem/git-bundle-server/internal/argparse" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) func main() { diff --git a/cmd/utils/container-helpers.go b/cmd/utils/container-helpers.go index 1ff71e2..38df7dc 100644 --- a/cmd/utils/container-helpers.go +++ b/cmd/utils/container-helpers.go @@ -3,13 +3,13 @@ package utils import ( "context" - "github.com/github/git-bundle-server/internal/bundles" - "github.com/github/git-bundle-server/internal/cmd" - "github.com/github/git-bundle-server/internal/common" - "github.com/github/git-bundle-server/internal/core" - "github.com/github/git-bundle-server/internal/daemon" - "github.com/github/git-bundle-server/internal/git" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/internal/bundles" + "github.com/git-ecosystem/git-bundle-server/internal/cmd" + "github.com/git-ecosystem/git-bundle-server/internal/common" + "github.com/git-ecosystem/git-bundle-server/internal/core" + "github.com/git-ecosystem/git-bundle-server/internal/daemon" + "github.com/git-ecosystem/git-bundle-server/internal/git" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) func BuildGitBundleServerContainer(logger log.TraceLogger) *DependencyContainer { diff --git a/cmd/utils/container-helpers_test.go b/cmd/utils/container-helpers_test.go index efd0226..c123175 100644 --- a/cmd/utils/container-helpers_test.go +++ b/cmd/utils/container-helpers_test.go @@ -12,9 +12,9 @@ import ( "strings" "testing" - "github.com/github/git-bundle-server/cmd/utils" - . "github.com/github/git-bundle-server/internal/testhelpers" - typeutils "github.com/github/git-bundle-server/internal/utils" + "github.com/git-ecosystem/git-bundle-server/cmd/utils" + . "github.com/git-ecosystem/git-bundle-server/internal/testhelpers" + typeutils "github.com/git-ecosystem/git-bundle-server/internal/utils" "github.com/stretchr/testify/assert" ) diff --git a/cmd/utils/cron.go b/cmd/utils/cron.go index bacc73e..4e02926 100644 --- a/cmd/utils/cron.go +++ b/cmd/utils/cron.go @@ -3,9 +3,9 @@ package utils import ( "context" - "github.com/github/git-bundle-server/internal/common" - "github.com/github/git-bundle-server/internal/core" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/internal/common" + "github.com/git-ecosystem/git-bundle-server/internal/core" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) type CronHelper interface { diff --git a/go.mod b/go.mod index 82bb106..02dd6ad 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/github/git-bundle-server +module github.com/git-ecosystem/git-bundle-server go 1.19 diff --git a/internal/argparse/argparse.go b/internal/argparse/argparse.go index 631eb58..b2eb8a8 100644 --- a/internal/argparse/argparse.go +++ b/internal/argparse/argparse.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) // For consistency with 'flag', use 2 as the usage-related error code diff --git a/internal/bundles/bundles.go b/internal/bundles/bundles.go index 23f4a06..0c98024 100644 --- a/internal/bundles/bundles.go +++ b/internal/bundles/bundles.go @@ -14,10 +14,10 @@ import ( "strings" "time" - "github.com/github/git-bundle-server/internal/common" - "github.com/github/git-bundle-server/internal/core" - "github.com/github/git-bundle-server/internal/git" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/internal/common" + "github.com/git-ecosystem/git-bundle-server/internal/core" + "github.com/git-ecosystem/git-bundle-server/internal/git" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) const ( diff --git a/internal/bundles/bundles_test.go b/internal/bundles/bundles_test.go index e0fb8f4..244655e 100644 --- a/internal/bundles/bundles_test.go +++ b/internal/bundles/bundles_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "github.com/github/git-bundle-server/internal/bundles" - "github.com/github/git-bundle-server/internal/core" - . "github.com/github/git-bundle-server/internal/testhelpers" + "github.com/git-ecosystem/git-bundle-server/internal/bundles" + "github.com/git-ecosystem/git-bundle-server/internal/core" + . "github.com/git-ecosystem/git-bundle-server/internal/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/cmd/command.go b/internal/cmd/command.go index 7c808e1..1a08fcd 100644 --- a/internal/cmd/command.go +++ b/internal/cmd/command.go @@ -6,7 +6,7 @@ import ( "os" "os/exec" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) type CommandExecutor interface { diff --git a/internal/cmd/settings.go b/internal/cmd/settings.go index 5aa11b1..69d12e2 100644 --- a/internal/cmd/settings.go +++ b/internal/cmd/settings.go @@ -3,7 +3,7 @@ package cmd import ( "io" - "github.com/github/git-bundle-server/internal/utils" + "github.com/git-ecosystem/git-bundle-server/internal/utils" ) type settingType int diff --git a/internal/common/filesystem.go b/internal/common/filesystem.go index 8c07f14..f1b1675 100644 --- a/internal/common/filesystem.go +++ b/internal/common/filesystem.go @@ -11,7 +11,7 @@ import ( "path/filepath" "syscall" - "github.com/github/git-bundle-server/internal/utils" + "github.com/git-ecosystem/git-bundle-server/internal/utils" ) const ( diff --git a/internal/core/cron.go b/internal/core/cron.go index 6fe5eec..7e296b3 100644 --- a/internal/core/cron.go +++ b/internal/core/cron.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "github.com/github/git-bundle-server/internal/cmd" - "github.com/github/git-bundle-server/internal/common" - "github.com/github/git-bundle-server/internal/log" - "github.com/github/git-bundle-server/internal/utils" + "github.com/git-ecosystem/git-bundle-server/internal/cmd" + "github.com/git-ecosystem/git-bundle-server/internal/common" + "github.com/git-ecosystem/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/internal/utils" ) type cronSchedule string diff --git a/internal/core/funcs_test.go b/internal/core/funcs_test.go index 19160d0..015bf48 100644 --- a/internal/core/funcs_test.go +++ b/internal/core/funcs_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/github/git-bundle-server/internal/core" + "github.com/git-ecosystem/git-bundle-server/internal/core" "github.com/stretchr/testify/assert" ) diff --git a/internal/core/repo.go b/internal/core/repo.go index 7d69ca9..3ba1dda 100644 --- a/internal/core/repo.go +++ b/internal/core/repo.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" - "github.com/github/git-bundle-server/internal/common" - "github.com/github/git-bundle-server/internal/git" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/internal/common" + "github.com/git-ecosystem/git-bundle-server/internal/git" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) type Repository struct { diff --git a/internal/core/repo_test.go b/internal/core/repo_test.go index 6c69ddb..5bd5561 100644 --- a/internal/core/repo_test.go +++ b/internal/core/repo_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "github.com/github/git-bundle-server/internal/common" - "github.com/github/git-bundle-server/internal/core" - . "github.com/github/git-bundle-server/internal/testhelpers" - "github.com/github/git-bundle-server/internal/utils" + "github.com/git-ecosystem/git-bundle-server/internal/common" + "github.com/git-ecosystem/git-bundle-server/internal/core" + . "github.com/git-ecosystem/git-bundle-server/internal/testhelpers" + "github.com/git-ecosystem/git-bundle-server/internal/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/daemon/daemon.go b/internal/daemon/daemon.go index 0356b97..2316db7 100644 --- a/internal/daemon/daemon.go +++ b/internal/daemon/daemon.go @@ -5,9 +5,9 @@ import ( "fmt" "runtime" - "github.com/github/git-bundle-server/internal/cmd" - "github.com/github/git-bundle-server/internal/common" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/internal/cmd" + "github.com/git-ecosystem/git-bundle-server/internal/common" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) type DaemonConfig struct { diff --git a/internal/daemon/launchd.go b/internal/daemon/launchd.go index 6a4bf73..0d59cc3 100644 --- a/internal/daemon/launchd.go +++ b/internal/daemon/launchd.go @@ -7,10 +7,10 @@ import ( "fmt" "path/filepath" - "github.com/github/git-bundle-server/internal/cmd" - "github.com/github/git-bundle-server/internal/common" - "github.com/github/git-bundle-server/internal/log" - "github.com/github/git-bundle-server/internal/utils" + "github.com/git-ecosystem/git-bundle-server/internal/cmd" + "github.com/git-ecosystem/git-bundle-server/internal/common" + "github.com/git-ecosystem/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/internal/utils" ) type xmlItem struct { diff --git a/internal/daemon/launchd_test.go b/internal/daemon/launchd_test.go index 3b85093..a76f9e9 100644 --- a/internal/daemon/launchd_test.go +++ b/internal/daemon/launchd_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "github.com/github/git-bundle-server/internal/daemon" - . "github.com/github/git-bundle-server/internal/testhelpers" + "github.com/git-ecosystem/git-bundle-server/internal/daemon" + . "github.com/git-ecosystem/git-bundle-server/internal/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/daemon/shared_test.go b/internal/daemon/shared_test.go index 25721cc..d577d64 100644 --- a/internal/daemon/shared_test.go +++ b/internal/daemon/shared_test.go @@ -1,7 +1,7 @@ package daemon_test import ( - "github.com/github/git-bundle-server/internal/daemon" + "github.com/git-ecosystem/git-bundle-server/internal/daemon" ) /*********************************************/ diff --git a/internal/daemon/systemd.go b/internal/daemon/systemd.go index 08b41d2..8861336 100644 --- a/internal/daemon/systemd.go +++ b/internal/daemon/systemd.go @@ -8,9 +8,9 @@ import ( "strings" "text/template" - "github.com/github/git-bundle-server/internal/cmd" - "github.com/github/git-bundle-server/internal/common" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/internal/cmd" + "github.com/git-ecosystem/git-bundle-server/internal/common" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) const serviceTemplate string = `[Unit] diff --git a/internal/daemon/systemd_test.go b/internal/daemon/systemd_test.go index a167c95..918bde9 100644 --- a/internal/daemon/systemd_test.go +++ b/internal/daemon/systemd_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/github/git-bundle-server/internal/daemon" - . "github.com/github/git-bundle-server/internal/testhelpers" + "github.com/git-ecosystem/git-bundle-server/internal/daemon" + . "github.com/git-ecosystem/git-bundle-server/internal/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/git/git.go b/internal/git/git.go index 0911129..ff1fad2 100644 --- a/internal/git/git.go +++ b/internal/git/git.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "github.com/github/git-bundle-server/internal/cmd" - "github.com/github/git-bundle-server/internal/log" + "github.com/git-ecosystem/git-bundle-server/internal/cmd" + "github.com/git-ecosystem/git-bundle-server/internal/log" ) type GitHelper interface { diff --git a/internal/git/git_test.go b/internal/git/git_test.go index 382e2c9..87ab708 100644 --- a/internal/git/git_test.go +++ b/internal/git/git_test.go @@ -5,9 +5,9 @@ import ( "io" "testing" - "github.com/github/git-bundle-server/internal/cmd" - "github.com/github/git-bundle-server/internal/git" - . "github.com/github/git-bundle-server/internal/testhelpers" + "github.com/git-ecosystem/git-bundle-server/internal/cmd" + "github.com/git-ecosystem/git-bundle-server/internal/git" + . "github.com/git-ecosystem/git-bundle-server/internal/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/testhelpers/funcs.go b/internal/testhelpers/funcs.go index 190f10a..baaabf1 100644 --- a/internal/testhelpers/funcs.go +++ b/internal/testhelpers/funcs.go @@ -1,6 +1,6 @@ package testhelpers -import "github.com/github/git-bundle-server/internal/utils" +import "github.com/git-ecosystem/git-bundle-server/internal/utils" /********************************************/ /************* Helper Functions *************/ diff --git a/internal/testhelpers/mocks.go b/internal/testhelpers/mocks.go index a374ac7..f70a0c0 100644 --- a/internal/testhelpers/mocks.go +++ b/internal/testhelpers/mocks.go @@ -9,8 +9,8 @@ import ( "os/user" "runtime" - "github.com/github/git-bundle-server/internal/cmd" - "github.com/github/git-bundle-server/internal/common" + "github.com/git-ecosystem/git-bundle-server/internal/cmd" + "github.com/git-ecosystem/git-bundle-server/internal/common" "github.com/stretchr/testify/mock" ) diff --git a/internal/utils/maps_test.go b/internal/utils/maps_test.go index 2a91865..076e84f 100644 --- a/internal/utils/maps_test.go +++ b/internal/utils/maps_test.go @@ -3,7 +3,7 @@ package utils_test import ( "testing" - "github.com/github/git-bundle-server/internal/utils" + "github.com/git-ecosystem/git-bundle-server/internal/utils" "github.com/stretchr/testify/assert" ) diff --git a/internal/utils/slices_test.go b/internal/utils/slices_test.go index 50d70ca..8bde7c5 100644 --- a/internal/utils/slices_test.go +++ b/internal/utils/slices_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/github/git-bundle-server/internal/utils" + "github.com/git-ecosystem/git-bundle-server/internal/utils" "github.com/stretchr/testify/assert" ) From 824fe3797d08ce17c0e8d77fd769d0c7ae002074 Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Tue, 2 May 2023 12:00:30 -0600 Subject: [PATCH 3/3] git-ecosystem migration: update bundle id Update Git Bundle Server's bundle id to `git-ecosystem` (based on this guidance [1] indicating that hyphens are acceptable). 1: https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleidentifier#discussion Signed-off-by: Lessley Dennington --- build/package/pkg/pack.sh | 2 +- scripts/uninstall.sh | 2 +- test/integration/features/support/daemonState.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/package/pkg/pack.sh b/build/package/pkg/pack.sh index 3d29132..6fb5dde 100755 --- a/build/package/pkg/pack.sh +++ b/build/package/pkg/pack.sh @@ -8,7 +8,7 @@ die () { THISDIR="$( cd "$(dirname "$0")" ; pwd -P )" # Product information -IDENTIFIER="com.github.gitbundleserver" +IDENTIFIER="com.git-ecosystem.gitbundleserver" INSTALL_LOCATION="/usr/local/git-bundle-server" # Defaults diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh index 6b5d25b..499a5c4 100755 --- a/scripts/uninstall.sh +++ b/scripts/uninstall.sh @@ -57,7 +57,7 @@ else fi # If installed via MacOS .pkg, remove package receipt -PKG_ID=com.github.gitbundleserver +PKG_ID=com.git-ecosystem.gitbundleserver if command -v pkgutil >/dev/null 2>&1 && pkgutil --pkgs=$PKG_ID >/dev/null 2>&1 then # Must run as root diff --git a/test/integration/features/support/daemonState.ts b/test/integration/features/support/daemonState.ts index de5f8c5..9420e3d 100644 --- a/test/integration/features/support/daemonState.ts +++ b/test/integration/features/support/daemonState.ts @@ -10,7 +10,7 @@ export function getLaunchDDaemonState(): DaemonState { var user = child_process.spawnSync('id', ['-u']).stdout.toString().trim() var cmdResult = child_process.spawnSync('launchctl', - ['print', `user/${user}/com.github.gitbundleserver`]) + ['print', `user/${user}/com.git-ecosystem.gitbundleserver`]) var state = parseOutput(cmdResult.stdout.toString(), regex) @@ -31,7 +31,7 @@ export function getSystemDDaemonState(): DaemonState { var user = child_process.spawnSync('id', ['-u']).stdout.toString() var cmdResult = child_process.spawnSync('systemctl', - ['status', '--user', user, 'com.github.gitbundleserver']) + ['status', '--user', user, 'com.git-ecosystem.gitbundleserver']) var state = parseOutput(cmdResult.stdout.toString(), regex)