From 1eb35b825b5758abcb1d2dd47bb18b0ce6976bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=89AU?= Date: Mon, 22 Dec 2025 23:41:05 +0100 Subject: [PATCH] rename project --- go.mod | 2 +- main.go | 12 ++++++------ pkg/app/app.go | 12 ++++++------ pkg/cheatsheet/generate.go | 8 ++++---- pkg/commands/container.go | 4 ++-- pkg/commands/docker.go | 8 ++++---- pkg/commands/dummies.go | 4 ++-- pkg/commands/image.go | 2 +- pkg/commands/os.go | 4 ++-- pkg/commands/service.go | 2 +- pkg/config/app_config.go | 17 +++++++++++++---- pkg/gui/app_status_manager.go | 2 +- pkg/gui/arrangement.go | 4 ++-- pkg/gui/container_logs.go | 6 +++--- pkg/gui/containers_panel.go | 14 +++++++------- pkg/gui/custom_commands.go | 8 ++++---- pkg/gui/gocui.go | 2 +- pkg/gui/gui.go | 12 ++++++------ pkg/gui/images_panel.go | 14 +++++++------- pkg/gui/menu_panel.go | 8 ++++---- pkg/gui/networks_panel.go | 14 +++++++------- pkg/gui/options_menu_panel.go | 2 +- pkg/gui/panels.go | 2 +- pkg/gui/panels/context_state.go | 2 +- pkg/gui/panels/side_list_panel.go | 4 ++-- pkg/gui/presentation/container_stats.go | 6 +++--- pkg/gui/presentation/containers.go | 6 +++--- pkg/gui/presentation/images.go | 4 ++-- pkg/gui/presentation/menu_items.go | 2 +- pkg/gui/presentation/networks.go | 2 +- pkg/gui/presentation/projects.go | 2 +- pkg/gui/presentation/services.go | 6 +++--- pkg/gui/presentation/volumes.go | 2 +- pkg/gui/project_panel.go | 18 +++++++++--------- pkg/gui/services_panel.go | 14 +++++++------- pkg/gui/sort_container_test.go | 2 +- pkg/gui/subprocess.go | 2 +- pkg/gui/tasks_adapter.go | 2 +- pkg/gui/view_helpers.go | 4 ++-- pkg/gui/volumes_panel.go | 14 +++++++------- pkg/i18n/chinese.go | 2 +- pkg/i18n/dutch.go | 2 +- pkg/i18n/english.go | 2 +- pkg/i18n/french.go | 2 +- pkg/i18n/german.go | 2 +- pkg/i18n/polish.go | 2 +- pkg/i18n/portuguese.go | 2 +- pkg/i18n/spanish.go | 2 +- pkg/i18n/turkish.go | 2 +- pkg/log/log.go | 2 +- pkg/tasks/tasks.go | 2 +- scripts/cheatsheet/main.go | 2 +- .../translations/get_required_translations.go | 2 +- 53 files changed, 145 insertions(+), 136 deletions(-) diff --git a/go.mod b/go.mod index f1f302bf..3768dd17 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/jesseduffield/lazydocker +module github.com/peauc/lazydocker-ng go 1.21 diff --git a/main.go b/main.go index 09f37180..28201309 100644 --- a/main.go +++ b/main.go @@ -11,9 +11,9 @@ import ( "github.com/docker/docker/client" "github.com/go-errors/errors" "github.com/integrii/flaggy" - "github.com/jesseduffield/lazydocker/pkg/app" - "github.com/jesseduffield/lazydocker/pkg/config" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/app" + "github.com/peauc/lazydocker-ng/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/jesseduffield/yaml" "github.com/samber/lo" ) @@ -44,9 +44,9 @@ func main() { runtime.GOARCH, ) - flaggy.SetName("lazydocker") + flaggy.SetName("lazydocker-ng") flaggy.SetDescription("The lazier way to manage everything docker") - flaggy.DefaultParser.AdditionalHelpPrepend = "https://github.com/jesseduffield/lazydocker" + flaggy.DefaultParser.AdditionalHelpPrepend = "https://github.com/peauc/lazydocker-ng" flaggy.Bool(&configFlag, "c", "config", "Print the current default config") flaggy.Bool(&debuggingFlag, "d", "debug", "a boolean") @@ -71,7 +71,7 @@ func main() { log.Fatal(err.Error()) } - appConfig, err := config.NewAppConfig("lazydocker", version, commit, date, buildSource, debuggingFlag, composeFiles, projectDir) + appConfig, err := config.NewAppConfig("lazydocker-ng", version, commit, date, buildSource, debuggingFlag, composeFiles, projectDir) if err != nil { log.Fatal(err.Error()) } diff --git a/pkg/app/app.go b/pkg/app/app.go index 827a453c..364d4451 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -4,12 +4,12 @@ import ( "io" "strings" - "github.com/jesseduffield/lazydocker/pkg/commands" - "github.com/jesseduffield/lazydocker/pkg/config" - "github.com/jesseduffield/lazydocker/pkg/gui" - "github.com/jesseduffield/lazydocker/pkg/i18n" - "github.com/jesseduffield/lazydocker/pkg/log" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/commands" + "github.com/peauc/lazydocker-ng/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/gui" + "github.com/peauc/lazydocker-ng/pkg/i18n" + "github.com/peauc/lazydocker-ng/pkg/log" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/sirupsen/logrus" ) diff --git a/pkg/cheatsheet/generate.go b/pkg/cheatsheet/generate.go index 76e9875d..b2cd579b 100644 --- a/pkg/cheatsheet/generate.go +++ b/pkg/cheatsheet/generate.go @@ -13,10 +13,10 @@ import ( "log" "os" - "github.com/jesseduffield/lazydocker/pkg/app" - "github.com/jesseduffield/lazydocker/pkg/config" - "github.com/jesseduffield/lazydocker/pkg/gui" - "github.com/jesseduffield/lazydocker/pkg/i18n" + "github.com/peauc/lazydocker-ng/pkg/app" + "github.com/peauc/lazydocker-ng/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/gui" + "github.com/peauc/lazydocker-ng/pkg/i18n" ) const ( diff --git a/pkg/commands/container.go b/pkg/commands/container.go index 997175f2..1bb7457f 100644 --- a/pkg/commands/container.go +++ b/pkg/commands/container.go @@ -13,8 +13,8 @@ import ( "github.com/docker/docker/api/types/filters" "github.com/docker/docker/client" "github.com/go-errors/errors" - "github.com/jesseduffield/lazydocker/pkg/i18n" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/i18n" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/sirupsen/logrus" "golang.org/x/xerrors" ) diff --git a/pkg/commands/docker.go b/pkg/commands/docker.go index ee083383..5af0c1f6 100644 --- a/pkg/commands/docker.go +++ b/pkg/commands/docker.go @@ -19,10 +19,10 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" "github.com/imdario/mergo" - "github.com/jesseduffield/lazydocker/pkg/commands/ssh" - "github.com/jesseduffield/lazydocker/pkg/config" - "github.com/jesseduffield/lazydocker/pkg/i18n" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/commands/ssh" + "github.com/peauc/lazydocker-ng/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/i18n" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/sasha-s/go-deadlock" "github.com/sirupsen/logrus" ) diff --git a/pkg/commands/dummies.go b/pkg/commands/dummies.go index 552171ac..f7837e33 100644 --- a/pkg/commands/dummies.go +++ b/pkg/commands/dummies.go @@ -3,8 +3,8 @@ package commands import ( "io" - "github.com/jesseduffield/lazydocker/pkg/config" - "github.com/jesseduffield/lazydocker/pkg/i18n" + "github.com/peauc/lazydocker-ng/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/i18n" "github.com/sirupsen/logrus" ) diff --git a/pkg/commands/image.go b/pkg/commands/image.go index 789733d0..468881f7 100644 --- a/pkg/commands/image.go +++ b/pkg/commands/image.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/api/types/image" "github.com/docker/docker/client" "github.com/fatih/color" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/samber/lo" "github.com/sirupsen/logrus" ) diff --git a/pkg/commands/os.go b/pkg/commands/os.go index b8dec4a0..54f010a1 100644 --- a/pkg/commands/os.go +++ b/pkg/commands/os.go @@ -14,8 +14,8 @@ import ( "github.com/go-errors/errors" "github.com/jesseduffield/kill" - "github.com/jesseduffield/lazydocker/pkg/config" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/mgutz/str" "github.com/sirupsen/logrus" ) diff --git a/pkg/commands/service.go b/pkg/commands/service.go index 755b7f5f..7ddde9e6 100644 --- a/pkg/commands/service.go +++ b/pkg/commands/service.go @@ -5,7 +5,7 @@ import ( "os/exec" "github.com/docker/docker/api/types/container" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/sirupsen/logrus" ) diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go index 9c0ad474..4a0efbb6 100644 --- a/pkg/config/app_config.go +++ b/pkg/config/app_config.go @@ -483,7 +483,7 @@ type AppConfig struct { Version string `long:"version" env:"VERSION" default:"unversioned"` Commit string `long:"commit" env:"COMMIT"` BuildDate string `long:"build-date" env:"BUILD_DATE"` - Name string `long:"name" env:"NAME" default:"lazydocker"` + Name string `long:"name" env:"NAME" default:"lazydocker-ng"` BuildSource string `long:"build-source" env:"BUILD_SOURCE" default:""` UserConfig *UserConfig ConfigDir string @@ -532,10 +532,19 @@ func configDirForVendor(vendor string, projectName string) string { } func configDir(projectName string) string { - legacyConfigDirectory := configDirForVendor("jesseduffield", projectName) - if _, err := os.Stat(legacyConfigDirectory); !os.IsNotExist(err) { - return legacyConfigDirectory + // Check for very old config (jesseduffield/lazydocker) + veryOldConfigDirectory := configDirForVendor("jesseduffield", "lazydocker") + if _, err := os.Stat(veryOldConfigDirectory); !os.IsNotExist(err) { + return veryOldConfigDirectory } + + // Check for old config (lazydocker) + oldConfigDirectory := configDirForVendor("", "lazydocker") + if _, err := os.Stat(oldConfigDirectory); !os.IsNotExist(err) { + return oldConfigDirectory + } + + // Use new config directory (lazydocker-ng) configDirectory := configDirForVendor("", projectName) return configDirectory } diff --git a/pkg/gui/app_status_manager.go b/pkg/gui/app_status_manager.go index f806f72c..d78ec515 100644 --- a/pkg/gui/app_status_manager.go +++ b/pkg/gui/app_status_manager.go @@ -4,7 +4,7 @@ import ( "time" "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/utils" ) type appStatus struct { diff --git a/pkg/gui/arrangement.go b/pkg/gui/arrangement.go index bcd4aa1c..04da0bc7 100644 --- a/pkg/gui/arrangement.go +++ b/pkg/gui/arrangement.go @@ -2,8 +2,8 @@ package gui import ( "github.com/jesseduffield/lazycore/pkg/boxlayout" - "github.com/jesseduffield/lazydocker/pkg/gui/panels" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/gui/panels" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/mattn/go-runewidth" "github.com/samber/lo" ) diff --git a/pkg/gui/container_logs.go b/pkg/gui/container_logs.go index bdb81608..fd01c389 100644 --- a/pkg/gui/container_logs.go +++ b/pkg/gui/container_logs.go @@ -11,9 +11,9 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/pkg/stdcopy" "github.com/fatih/color" - "github.com/jesseduffield/lazydocker/pkg/commands" - "github.com/jesseduffield/lazydocker/pkg/tasks" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/commands" + "github.com/peauc/lazydocker-ng/pkg/tasks" + "github.com/peauc/lazydocker-ng/pkg/utils" ) func (gui *Gui) renderContainerLogsToMain(container *commands.Container) tasks.TaskFunc { diff --git a/pkg/gui/containers_panel.go b/pkg/gui/containers_panel.go index 11e2f6c2..1e47af7a 100644 --- a/pkg/gui/containers_panel.go +++ b/pkg/gui/containers_panel.go @@ -9,13 +9,13 @@ import ( "github.com/docker/docker/api/types/container" "github.com/fatih/color" "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazydocker/pkg/commands" - "github.com/jesseduffield/lazydocker/pkg/config" - "github.com/jesseduffield/lazydocker/pkg/gui/panels" - "github.com/jesseduffield/lazydocker/pkg/gui/presentation" - "github.com/jesseduffield/lazydocker/pkg/gui/types" - "github.com/jesseduffield/lazydocker/pkg/tasks" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/commands" + "github.com/peauc/lazydocker-ng/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/gui/panels" + "github.com/peauc/lazydocker-ng/pkg/gui/presentation" + "github.com/peauc/lazydocker-ng/pkg/gui/types" + "github.com/peauc/lazydocker-ng/pkg/tasks" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/samber/lo" ) diff --git a/pkg/gui/custom_commands.go b/pkg/gui/custom_commands.go index f9981607..13fe9d1b 100644 --- a/pkg/gui/custom_commands.go +++ b/pkg/gui/custom_commands.go @@ -2,10 +2,10 @@ package gui import ( "github.com/fatih/color" - "github.com/jesseduffield/lazydocker/pkg/commands" - "github.com/jesseduffield/lazydocker/pkg/config" - "github.com/jesseduffield/lazydocker/pkg/gui/types" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/commands" + "github.com/peauc/lazydocker-ng/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/gui/types" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/samber/lo" ) diff --git a/pkg/gui/gocui.go b/pkg/gui/gocui.go index e4c0b155..9cbe647b 100644 --- a/pkg/gui/gocui.go +++ b/pkg/gui/gocui.go @@ -3,7 +3,7 @@ package gui import ( "github.com/gookit/color" "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/utils" ) var gocuiColorMap = map[string]gocui.Attribute{ diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index bd3f2cff..b8be6bef 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -13,12 +13,12 @@ import ( throttle "github.com/boz/go-throttle" "github.com/jesseduffield/gocui" lcUtils "github.com/jesseduffield/lazycore/pkg/utils" - "github.com/jesseduffield/lazydocker/pkg/commands" - "github.com/jesseduffield/lazydocker/pkg/config" - "github.com/jesseduffield/lazydocker/pkg/gui/panels" - "github.com/jesseduffield/lazydocker/pkg/gui/types" - "github.com/jesseduffield/lazydocker/pkg/i18n" - "github.com/jesseduffield/lazydocker/pkg/tasks" + "github.com/peauc/lazydocker-ng/pkg/commands" + "github.com/peauc/lazydocker-ng/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/gui/panels" + "github.com/peauc/lazydocker-ng/pkg/gui/types" + "github.com/peauc/lazydocker-ng/pkg/i18n" + "github.com/peauc/lazydocker-ng/pkg/tasks" "github.com/sasha-s/go-deadlock" "github.com/sirupsen/logrus" ) diff --git a/pkg/gui/images_panel.go b/pkg/gui/images_panel.go index 7b0d5643..406e542e 100644 --- a/pkg/gui/images_panel.go +++ b/pkg/gui/images_panel.go @@ -8,13 +8,13 @@ import ( "github.com/docker/docker/api/types/image" "github.com/fatih/color" "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazydocker/pkg/commands" - "github.com/jesseduffield/lazydocker/pkg/config" - "github.com/jesseduffield/lazydocker/pkg/gui/panels" - "github.com/jesseduffield/lazydocker/pkg/gui/presentation" - "github.com/jesseduffield/lazydocker/pkg/gui/types" - "github.com/jesseduffield/lazydocker/pkg/tasks" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/commands" + "github.com/peauc/lazydocker-ng/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/gui/panels" + "github.com/peauc/lazydocker-ng/pkg/gui/presentation" + "github.com/peauc/lazydocker-ng/pkg/gui/types" + "github.com/peauc/lazydocker-ng/pkg/tasks" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/samber/lo" ) diff --git a/pkg/gui/menu_panel.go b/pkg/gui/menu_panel.go index 99c65807..46df6846 100644 --- a/pkg/gui/menu_panel.go +++ b/pkg/gui/menu_panel.go @@ -1,10 +1,10 @@ package gui import ( - "github.com/jesseduffield/lazydocker/pkg/gui/panels" - "github.com/jesseduffield/lazydocker/pkg/gui/presentation" - "github.com/jesseduffield/lazydocker/pkg/gui/types" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/gui/panels" + "github.com/peauc/lazydocker-ng/pkg/gui/presentation" + "github.com/peauc/lazydocker-ng/pkg/gui/types" + "github.com/peauc/lazydocker-ng/pkg/utils" ) type CreateMenuOptions struct { diff --git a/pkg/gui/networks_panel.go b/pkg/gui/networks_panel.go index 4702d35d..69e597ee 100644 --- a/pkg/gui/networks_panel.go +++ b/pkg/gui/networks_panel.go @@ -5,13 +5,13 @@ import ( "github.com/fatih/color" "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazydocker/pkg/commands" - "github.com/jesseduffield/lazydocker/pkg/config" - "github.com/jesseduffield/lazydocker/pkg/gui/panels" - "github.com/jesseduffield/lazydocker/pkg/gui/presentation" - "github.com/jesseduffield/lazydocker/pkg/gui/types" - "github.com/jesseduffield/lazydocker/pkg/tasks" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/commands" + "github.com/peauc/lazydocker-ng/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/gui/panels" + "github.com/peauc/lazydocker-ng/pkg/gui/presentation" + "github.com/peauc/lazydocker-ng/pkg/gui/types" + "github.com/peauc/lazydocker-ng/pkg/tasks" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/samber/lo" ) diff --git a/pkg/gui/options_menu_panel.go b/pkg/gui/options_menu_panel.go index 38ba71a5..aa65cc09 100644 --- a/pkg/gui/options_menu_panel.go +++ b/pkg/gui/options_menu_panel.go @@ -4,7 +4,7 @@ import ( "github.com/samber/lo" "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazydocker/pkg/gui/types" + "github.com/peauc/lazydocker-ng/pkg/gui/types" ) func (gui *Gui) getBindings(v *gocui.View) []*Binding { diff --git a/pkg/gui/panels.go b/pkg/gui/panels.go index b92e44e1..99bb11ce 100644 --- a/pkg/gui/panels.go +++ b/pkg/gui/panels.go @@ -1,6 +1,6 @@ package gui -import "github.com/jesseduffield/lazydocker/pkg/gui/panels" +import "github.com/peauc/lazydocker-ng/pkg/gui/panels" func (gui *Gui) intoInterface() panels.IGui { return gui diff --git a/pkg/gui/panels/context_state.go b/pkg/gui/panels/context_state.go index 36610cff..422aa66b 100644 --- a/pkg/gui/panels/context_state.go +++ b/pkg/gui/panels/context_state.go @@ -1,7 +1,7 @@ package panels import ( - "github.com/jesseduffield/lazydocker/pkg/tasks" + "github.com/peauc/lazydocker-ng/pkg/tasks" "github.com/samber/lo" ) diff --git a/pkg/gui/panels/side_list_panel.go b/pkg/gui/panels/side_list_panel.go index 2473e2ce..85588147 100644 --- a/pkg/gui/panels/side_list_panel.go +++ b/pkg/gui/panels/side_list_panel.go @@ -7,8 +7,8 @@ import ( "github.com/go-errors/errors" "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazydocker/pkg/tasks" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/tasks" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/samber/lo" ) diff --git a/pkg/gui/presentation/container_stats.go b/pkg/gui/presentation/container_stats.go index e3a9b3dc..64936131 100644 --- a/pkg/gui/presentation/container_stats.go +++ b/pkg/gui/presentation/container_stats.go @@ -10,9 +10,9 @@ import ( "github.com/fatih/color" "github.com/jesseduffield/asciigraph" - "github.com/jesseduffield/lazydocker/pkg/commands" - "github.com/jesseduffield/lazydocker/pkg/config" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/commands" + "github.com/peauc/lazydocker-ng/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/mcuadros/go-lookup" "github.com/samber/lo" ) diff --git a/pkg/gui/presentation/containers.go b/pkg/gui/presentation/containers.go index f58fc706..fc141211 100644 --- a/pkg/gui/presentation/containers.go +++ b/pkg/gui/presentation/containers.go @@ -8,9 +8,9 @@ import ( dockerTypes "github.com/docker/docker/api/types" "github.com/fatih/color" - "github.com/jesseduffield/lazydocker/pkg/commands" - "github.com/jesseduffield/lazydocker/pkg/config" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/commands" + "github.com/peauc/lazydocker-ng/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/samber/lo" ) diff --git a/pkg/gui/presentation/images.go b/pkg/gui/presentation/images.go index a420a85d..f35045ac 100644 --- a/pkg/gui/presentation/images.go +++ b/pkg/gui/presentation/images.go @@ -1,8 +1,8 @@ package presentation import ( - "github.com/jesseduffield/lazydocker/pkg/commands" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/commands" + "github.com/peauc/lazydocker-ng/pkg/utils" ) func GetImageDisplayStrings(image *commands.Image) []string { diff --git a/pkg/gui/presentation/menu_items.go b/pkg/gui/presentation/menu_items.go index 6febd261..c77d02ac 100644 --- a/pkg/gui/presentation/menu_items.go +++ b/pkg/gui/presentation/menu_items.go @@ -1,6 +1,6 @@ package presentation -import "github.com/jesseduffield/lazydocker/pkg/gui/types" +import "github.com/peauc/lazydocker-ng/pkg/gui/types" func GetMenuItemDisplayStrings(menuItem *types.MenuItem) []string { return menuItem.LabelColumns diff --git a/pkg/gui/presentation/networks.go b/pkg/gui/presentation/networks.go index 88a29fc9..4e31a9f4 100644 --- a/pkg/gui/presentation/networks.go +++ b/pkg/gui/presentation/networks.go @@ -1,6 +1,6 @@ package presentation -import "github.com/jesseduffield/lazydocker/pkg/commands" +import "github.com/peauc/lazydocker-ng/pkg/commands" func GetNetworkDisplayStrings(network *commands.Network) []string { return []string{network.Network.Driver, network.Name} diff --git a/pkg/gui/presentation/projects.go b/pkg/gui/presentation/projects.go index 44d396c9..83e59547 100644 --- a/pkg/gui/presentation/projects.go +++ b/pkg/gui/presentation/projects.go @@ -1,6 +1,6 @@ package presentation -import "github.com/jesseduffield/lazydocker/pkg/commands" +import "github.com/peauc/lazydocker-ng/pkg/commands" func GetProjectDisplayStrings(project *commands.Project) []string { return []string{project.Name} diff --git a/pkg/gui/presentation/services.go b/pkg/gui/presentation/services.go index 7e781ec1..26ddf9a5 100644 --- a/pkg/gui/presentation/services.go +++ b/pkg/gui/presentation/services.go @@ -2,9 +2,9 @@ package presentation import ( "github.com/fatih/color" - "github.com/jesseduffield/lazydocker/pkg/commands" - "github.com/jesseduffield/lazydocker/pkg/config" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/commands" + "github.com/peauc/lazydocker-ng/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/utils" ) func GetServiceDisplayStrings(guiConfig *config.GuiConfig, service *commands.Service) []string { diff --git a/pkg/gui/presentation/volumes.go b/pkg/gui/presentation/volumes.go index c6b90eb1..70fa0656 100644 --- a/pkg/gui/presentation/volumes.go +++ b/pkg/gui/presentation/volumes.go @@ -1,6 +1,6 @@ package presentation -import "github.com/jesseduffield/lazydocker/pkg/commands" +import "github.com/peauc/lazydocker-ng/pkg/commands" func GetVolumeDisplayStrings(volume *commands.Volume) []string { return []string{volume.Volume.Driver, volume.Name} diff --git a/pkg/gui/project_panel.go b/pkg/gui/project_panel.go index 864a019d..08def4e1 100644 --- a/pkg/gui/project_panel.go +++ b/pkg/gui/project_panel.go @@ -4,18 +4,18 @@ import ( "bytes" "context" "github.com/docker/docker/api/types/container" - "github.com/jesseduffield/lazydocker/pkg/gui/types" + "github.com/peauc/lazydocker-ng/pkg/gui/types" "log" "path" "strings" "github.com/fatih/color" "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazydocker/pkg/commands" - "github.com/jesseduffield/lazydocker/pkg/gui/panels" - "github.com/jesseduffield/lazydocker/pkg/gui/presentation" - "github.com/jesseduffield/lazydocker/pkg/tasks" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/commands" + "github.com/peauc/lazydocker-ng/pkg/gui/panels" + "github.com/peauc/lazydocker-ng/pkg/gui/presentation" + "github.com/peauc/lazydocker-ng/pkg/tasks" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/jesseduffield/yaml" ) @@ -122,9 +122,9 @@ func (gui *Gui) creditsStr() string { []string{ lazydockerTitle(), "Copyright (c) 2019 Jesse Duffield", - "Keybindings: https://github.com/jesseduffield/lazydocker/blob/master/docs/keybindings", - "Config Options: https://github.com/jesseduffield/lazydocker/blob/master/docs/Config.md", - "Raise an Issue: https://github.com/jesseduffield/lazydocker/issues", + "Keybindings: https://github.com/peauc/lazydocker-ng/blob/master/docs/keybindings", + "Config Options: https://github.com/peauc/lazydocker-ng/blob/master/docs/Config.md", + "Raise an Issue: https://github.com/peauc/lazydocker-ng/issues", utils.ColoredString("Buy Jesse a coffee: https://github.com/sponsors/jesseduffield", color.FgMagenta), // caffeine ain't free "Here's your lazydocker config when merged in with the defaults (you can open your config by pressing 'o'):", utils.ColoredYamlString(configBuf.String()), diff --git a/pkg/gui/services_panel.go b/pkg/gui/services_panel.go index c9dd4d1d..4c24d749 100644 --- a/pkg/gui/services_panel.go +++ b/pkg/gui/services_panel.go @@ -7,13 +7,13 @@ import ( "github.com/fatih/color" "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazydocker/pkg/commands" - "github.com/jesseduffield/lazydocker/pkg/config" - "github.com/jesseduffield/lazydocker/pkg/gui/panels" - "github.com/jesseduffield/lazydocker/pkg/gui/presentation" - "github.com/jesseduffield/lazydocker/pkg/gui/types" - "github.com/jesseduffield/lazydocker/pkg/tasks" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/commands" + "github.com/peauc/lazydocker-ng/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/gui/panels" + "github.com/peauc/lazydocker-ng/pkg/gui/presentation" + "github.com/peauc/lazydocker-ng/pkg/gui/types" + "github.com/peauc/lazydocker-ng/pkg/tasks" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/samber/lo" ) diff --git a/pkg/gui/sort_container_test.go b/pkg/gui/sort_container_test.go index e4aff5a0..84953ad7 100644 --- a/pkg/gui/sort_container_test.go +++ b/pkg/gui/sort_container_test.go @@ -5,7 +5,7 @@ import ( "testing" dockerTypes "github.com/docker/docker/api/types" - "github.com/jesseduffield/lazydocker/pkg/commands" + "github.com/peauc/lazydocker-ng/pkg/commands" "github.com/stretchr/testify/assert" ) diff --git a/pkg/gui/subprocess.go b/pkg/gui/subprocess.go index b41ac475..e5b2f03a 100644 --- a/pkg/gui/subprocess.go +++ b/pkg/gui/subprocess.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/fatih/color" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/utils" ) func (gui *Gui) runSubprocess(cmd *exec.Cmd) error { diff --git a/pkg/gui/tasks_adapter.go b/pkg/gui/tasks_adapter.go index f85e4723..db8edd3f 100644 --- a/pkg/gui/tasks_adapter.go +++ b/pkg/gui/tasks_adapter.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/jesseduffield/lazydocker/pkg/tasks" + "github.com/peauc/lazydocker-ng/pkg/tasks" ) func (gui *Gui) QueueTask(f func(ctx context.Context)) error { diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go index 6acbb18c..702d99e4 100644 --- a/pkg/gui/view_helpers.go +++ b/pkg/gui/view_helpers.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazydocker/pkg/gui/panels" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/gui/panels" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/samber/lo" "github.com/spkg/bom" ) diff --git a/pkg/gui/volumes_panel.go b/pkg/gui/volumes_panel.go index 96085949..88526a4f 100644 --- a/pkg/gui/volumes_panel.go +++ b/pkg/gui/volumes_panel.go @@ -5,13 +5,13 @@ import ( "github.com/fatih/color" "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazydocker/pkg/commands" - "github.com/jesseduffield/lazydocker/pkg/config" - "github.com/jesseduffield/lazydocker/pkg/gui/panels" - "github.com/jesseduffield/lazydocker/pkg/gui/presentation" - "github.com/jesseduffield/lazydocker/pkg/gui/types" - "github.com/jesseduffield/lazydocker/pkg/tasks" - "github.com/jesseduffield/lazydocker/pkg/utils" + "github.com/peauc/lazydocker-ng/pkg/commands" + "github.com/peauc/lazydocker-ng/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/gui/panels" + "github.com/peauc/lazydocker-ng/pkg/gui/presentation" + "github.com/peauc/lazydocker-ng/pkg/gui/types" + "github.com/peauc/lazydocker-ng/pkg/tasks" + "github.com/peauc/lazydocker-ng/pkg/utils" "github.com/samber/lo" ) diff --git a/pkg/i18n/chinese.go b/pkg/i18n/chinese.go index aa125f0b..4d46d3a9 100644 --- a/pkg/i18n/chinese.go +++ b/pkg/i18n/chinese.go @@ -16,7 +16,7 @@ func chineseSet() TranslationSet { NoViewMachingNewLineFocusedSwitchStatement: "没有匹配 newLineFocused switch 语句的视图", - ErrorOccurred: "发生错误！请在 https://github.com/jesseduffield/lazydocker/issues 上创建一个问题", + ErrorOccurred: "发生错误！请在 https://github.com/peauc/lazydocker-ng/issues 上创建一个问题", ConnectionFailed: "无法连接到 Docker 客户端。您可能需要重新启动 Docker 客户端", UnattachableContainerError: "容器不支持 attaching。您必须使用“-it”标志运行服务，或者在docker-compose.yml文件中使用`stdin_open: true，tty: true`", WaitingForContainerInfo: "在 Docker 给我们更多关于容器的信息之前，无法继续。请几分钟后重试。", diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go index 8a8601c2..260b8d62 100644 --- a/pkg/i18n/dutch.go +++ b/pkg/i18n/dutch.go @@ -10,7 +10,7 @@ func dutchSet() TranslationSet { NoViewMachingNewLineFocusedSwitchStatement: "No view matching newLineFocused switch statement", - ErrorOccurred: "Er is iets fout gegaan! Zou je hier een issue aan willen maken: https://github.com/jesseduffield/lazydocker/issues", + ErrorOccurred: "Er is iets fout gegaan! Zou je hier een issue aan willen maken: https://github.com/peauc/lazydocker-ng/issues", ConnectionFailed: "connectie naar de docker client mislukt. Het zou kunnen dat je de docker client moet herstarten", UnattachableContainerError: "Container heeft geen ondersteuning voor vastmaken. Je zou de service met het '-it' argument kunnen draaien of stop dit in je `stdin_open: true, tty: true` docker-compose.yml", CannotAttachStoppedContainerError: "Je kan niet een vastgemaakte container stoppen, je moet het eerst starten (dit kan je doen met de 'r' toets) (ja ik ben te leu om dat voor je te doen automatisch)", diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index c1537672..cde2b817 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -154,7 +154,7 @@ func englishSet() TranslationSet { NoViewMachingNewLineFocusedSwitchStatement: "No view matching newLineFocused switch statement", - ErrorOccurred: "An error occurred! Please create an issue at https://github.com/jesseduffield/lazydocker/issues", + ErrorOccurred: "An error occurred! Please create an issue at https://github.com/peauc/lazydocker-ng/issues", ConnectionFailed: "connection to docker client failed. You may need to restart the docker client", UnattachableContainerError: "Container does not support attaching. You must either run the service with the '-it' flag or use `stdin_open: true, tty: true` in the docker-compose.yml file", WaitingForContainerInfo: "Cannot proceed until docker gives us more information about the container. Please retry in a few moments.", diff --git a/pkg/i18n/french.go b/pkg/i18n/french.go index 29ab5be2..90831e5e 100644 --- a/pkg/i18n/french.go +++ b/pkg/i18n/french.go @@ -13,7 +13,7 @@ func frenchSet() TranslationSet { NoViewMachingNewLineFocusedSwitchStatement: "Aucune vue correspondant au switch newLineFocused", - ErrorOccurred: "Une erreur s'est produite ! Veuillez créer un rapport d'erreur sur https://github.com/jesseduffield/lazydocker/issues", + ErrorOccurred: "Une erreur s'est produite ! Veuillez créer un rapport d'erreur sur https://github.com/peauc/lazydocker-ng/issues", ConnectionFailed: "Erreur lors de la connexion au client Docker. Essayez de redémarrer votre client Docker", UnattachableContainerError: "Le conteneur ne peut pas être attaché. Vous devez exécuter le service avec le drapeau 'it' ou bien utiliser `stdin_open: true, tty: true` dans votre fichier docker-compose.yml", WaitingForContainerInfo: "Le processus ne peut pas continuer avant que Docker ne fournisse plus d'informations. Veuillez réessayer dans quelques instants.", diff --git a/pkg/i18n/german.go b/pkg/i18n/german.go index ac23d6b1..7ae06c3a 100644 --- a/pkg/i18n/german.go +++ b/pkg/i18n/german.go @@ -10,7 +10,7 @@ func germanSet() TranslationSet { NoViewMachingNewLineFocusedSwitchStatement: "No view matching newLineFocused switch statement", - ErrorOccurred: "Es ist ein Fehler aufgetreten! Bitte erstelle ein Issue hier: https://github.com/jesseduffield/lazydocker/issues", + ErrorOccurred: "Es ist ein Fehler aufgetreten! Bitte erstelle ein Issue hier: https://github.com/peauc/lazydocker-ng/issues", ConnectionFailed: "Verbindung zum Docker Client fehlgeschlagen. Du musst ggf. den Docker Client neustarten.", UnattachableContainerError: "Der Container bietet keine Unterstützung für das Anbinden. Du musst den Dienst entweder mit der '-it' Flagge benutzen oder `stdin_open: true, tty: true` in der docker-compose.yml Datei setzen.", CannotAttachStoppedContainerError: "Du kannst keinen angehaltenen Container anbinden. Du musst ihn erst starten (was du tun kannst, indem du 'r' drückst), (ja, ich bin zu faul um das zu automatisieren) (aber ist schon cool, dass ich so eine Konversation durch eine Fehlermeldung mit dir führen kann)", diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go index 1025bf47..56ca0b59 100644 --- a/pkg/i18n/polish.go +++ b/pkg/i18n/polish.go @@ -10,7 +10,7 @@ func polishSet() TranslationSet { NoViewMachingNewLineFocusedSwitchStatement: "Żaden widok nie odpowiada instrukcji przełączenia newLineFocused", - ErrorOccurred: "Wystąpił błąd! Proszę go zgłosić na https://github.com/jesseduffield/lazydocker/issues", + ErrorOccurred: "Wystąpił błąd! Proszę go zgłosić na https://github.com/peauc/lazydocker-ng/issues", ConnectionFailed: "Błąd połączenia z Dockerem. Być może należy go zrestartować.", UnattachableContainerError: "Kontener nie obsługuje przyczepiania (attach). Musisz albo użyć flag '-it', albo `stdin_open: true, tty: true` w pliku docker-compose.yml.", CannotAttachStoppedContainerError: "Nie można przyczepić się do zatrzymanego kontenera, należy go najpierw uruchomić (co można wykonać wciskając przycisk 'r')", diff --git a/pkg/i18n/portuguese.go b/pkg/i18n/portuguese.go index 36d9bcfd..a5a1b729 100644 --- a/pkg/i18n/portuguese.go +++ b/pkg/i18n/portuguese.go @@ -16,7 +16,7 @@ func portugueseSet() TranslationSet { NoViewMachingNewLineFocusedSwitchStatement: "No view matching newLineFocused switch statement", - ErrorOccurred: "Um erro ocorreu! Por favor, crie uma issue em https://github.com/jesseduffield/lazydocker/issues", + ErrorOccurred: "Um erro ocorreu! Por favor, crie uma issue em https://github.com/peauc/lazydocker-ng/issues", ConnectionFailed: "Falha na conexão com o cliente Docker. Você pode precisar reiniciar o seu cliente Docker", UnattachableContainerError: "O contêiner não suporta anexação. Você deve executar o serviço com a flag '-it' ou usar `stdin_open: true, tty: true` no arquivo docker-compose.yml", WaitingForContainerInfo: "Não é possível prosseguir até que o Docker forneça mais informações sobre o contêiner. Por favor, tente novamente em alguns momentos.", diff --git a/pkg/i18n/spanish.go b/pkg/i18n/spanish.go index b9148c3a..c14c3096 100644 --- a/pkg/i18n/spanish.go +++ b/pkg/i18n/spanish.go @@ -14,7 +14,7 @@ func spanishSet() TranslationSet { RunningCustomCommandStatus: "ejecutando comando personalizado", RunningBulkCommandStatus: "ejecutando comando masivo", - ErrorOccurred: "¡Hubo un error! Por favor crea un issue en https://github.com/jesseduffield/lazydocker/issues", + ErrorOccurred: "¡Hubo un error! Por favor crea un issue en https://github.com/peauc/lazydocker-ng/issues", ConnectionFailed: "Falló la conexión con el docker client. Quizá necesitas reiniciar tu docker client", UnattachableContainerError: "Container does not support attaching. You must either run the service with the '-it' flag or use `stdin_open: true, tty: true` in the docker-compose.yml file", WaitingForContainerInfo: "No podemos proceder hasta que docker nos de más información sobre el contenedor. Inténtalo otra vez en unos segundos.", diff --git a/pkg/i18n/turkish.go b/pkg/i18n/turkish.go index fccb3d91..bfc61063 100644 --- a/pkg/i18n/turkish.go +++ b/pkg/i18n/turkish.go @@ -10,7 +10,7 @@ func turkishSet() TranslationSet { NoViewMachingNewLineFocusedSwitchStatement: "NewLineFocused anahtar deyimi ile eşleşen görünüm yok", - ErrorOccurred: "Bir hata oluştu! Lütfen https://github.com/jesseduffield/lazydocker/issues adresinden bir hataya ilişkin konu oluşturun", + ErrorOccurred: "Bir hata oluştu! Lütfen https://github.com/peauc/lazydocker-ng/issues adresinden bir hataya ilişkin konu oluşturun", ConnectionFailed: "Docker bağlantısı başarısız oldu. Docker' ı yeniden başlatmanız gerekebilir", UnattachableContainerError: "Konteyner attaching modunda çalışmayı desteklemiyor. Hizmeti '-it' opsiyonu ile çalıştırmanız veya docker-compose.yml dosyasında `stdin_open: true, tty: true` kullanmanız gerekir.", CannotAttachStoppedContainerError: "Durdurulan konteynera bağlanamazsınız, ilk önce başlatmanız gerekir (aslında başlatmayı r tuşu ile yapabilirsiniz) (evet, senin için bunu otomatik olarak yapabilirim fakat çok tembelim) (hata mesajı ile seninle birebir iletişim kurmam çok daha güzel)", diff --git a/pkg/log/log.go b/pkg/log/log.go index 232a7bb8..d7cc4b0b 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/jesseduffield/lazydocker/pkg/config" + "github.com/peauc/lazydocker-ng/pkg/config" "github.com/sirupsen/logrus" ) diff --git a/pkg/tasks/tasks.go b/pkg/tasks/tasks.go index 06fac38f..be3d0d37 100644 --- a/pkg/tasks/tasks.go +++ b/pkg/tasks/tasks.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/jesseduffield/lazydocker/pkg/i18n" + "github.com/peauc/lazydocker-ng/pkg/i18n" "github.com/sasha-s/go-deadlock" "github.com/sirupsen/logrus" ) diff --git a/scripts/cheatsheet/main.go b/scripts/cheatsheet/main.go index 53f72eda..40017e22 100644 --- a/scripts/cheatsheet/main.go +++ b/scripts/cheatsheet/main.go @@ -5,7 +5,7 @@ import ( "log" "os" - "github.com/jesseduffield/lazydocker/pkg/cheatsheet" + "github.com/peauc/lazydocker-ng/pkg/cheatsheet" ) func main() { diff --git a/scripts/translations/get_required_translations.go b/scripts/translations/get_required_translations.go index 9e0dd400..faa38fa6 100644 --- a/scripts/translations/get_required_translations.go +++ b/scripts/translations/get_required_translations.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - "github.com/jesseduffield/lazydocker/pkg/i18n" + "github.com/peauc/lazydocker-ng/pkg/i18n" ) func main() {