From 02c557f42eaec95a0251eab3176ee8ba9cae59db Mon Sep 17 00:00:00 2001 From: maxlandon Date: Thu, 5 Jan 2023 21:57:38 +0100 Subject: [PATCH] refactor(go): adapt imports for go.mod consistency --- src/ansi/ansi_writer.go | 4 ++-- src/ansi/ansi_writer_hyperlink.go | 4 ++-- src/ansi/ansi_writer_hyperlink_test.go | 2 +- src/ansi/ansi_writer_test.go | 2 +- src/ansi/colors.go | 2 +- src/ansi/colors_unix.go | 2 +- src/ansi/colors_windows.go | 2 +- src/cli/cache.go | 2 +- src/cli/config_export.go | 4 ++-- src/cli/config_export_image.go | 8 ++++---- src/cli/config_migrate.go | 4 ++-- src/cli/debug.go | 8 ++++---- src/cli/font.go | 4 ++-- src/cli/get.go | 4 ++-- src/cli/init.go | 6 +++--- src/cli/print.go | 4 ++-- src/cli/toggle.go | 2 +- src/engine/block.go | 6 +++--- src/engine/config.go | 10 +++++----- src/engine/config_test.go | 8 ++++---- src/engine/engine.go | 8 ++++---- src/engine/engine_test.go | 8 ++++---- src/engine/image.go | 4 ++-- src/engine/image_test.go | 4 ++-- src/engine/migrate.go | 6 +++--- src/engine/migrate_test.go | 6 +++--- src/engine/new.go | 6 +++--- src/engine/responsive.go | 2 +- src/engine/responsive_test.go | 2 +- src/engine/segment.go | 10 +++++----- src/engine/segment_test.go | 8 ++++---- src/go.mod | 2 +- src/http/oauth.go | 4 ++-- src/http/oauth_test.go | 4 ++-- src/http/request.go | 4 ++-- src/http/request_test.go | 4 ++-- src/main.go | 2 +- src/main_test.go | 2 +- src/mock/environment.go | 4 ++-- src/platform/battery/battery_darwin.go | 4 ++-- src/platform/shell.go | 8 ++++---- src/platform/shell_darwin.go | 4 ++-- src/platform/shell_windows_nix.go | 2 +- src/platform/win32_windows.go | 2 +- src/properties/properties.go | 4 ++-- src/segments/angular.go | 4 ++-- src/segments/aws.go | 4 ++-- src/segments/aws_test.go | 4 ++-- src/segments/az.go | 4 ++-- src/segments/az_functions.go | 4 ++-- src/segments/az_test.go | 6 +++--- src/segments/battery.go | 6 +++--- src/segments/brewfather.go | 4 ++-- src/segments/brewfather_test.go | 4 ++-- src/segments/cds.go | 4 ++-- src/segments/cds_test.go | 6 +++--- src/segments/cf.go | 4 ++-- src/segments/cf_target.go | 4 ++-- src/segments/cf_target_test.go | 4 ++-- src/segments/cf_test.go | 6 +++--- src/segments/cmake.go | 4 ++-- src/segments/command.go | 4 ++-- src/segments/command_test.go | 4 ++-- src/segments/connection.go | 4 ++-- src/segments/connection_test.go | 6 +++--- src/segments/crystal.go | 4 ++-- src/segments/dart.go | 4 ++-- src/segments/deno.go | 4 ++-- src/segments/dotnet.go | 6 +++--- src/segments/dotnet_test.go | 8 ++++---- src/segments/executiontime.go | 4 ++-- src/segments/executiontime_test.go | 4 ++-- src/segments/exit.go | 4 ++-- src/segments/exit_test.go | 6 +++--- src/segments/flutter.go | 4 ++-- src/segments/fossil_test.go | 4 ++-- src/segments/gcp.go | 4 ++-- src/segments/gcp_test.go | 4 ++-- src/segments/git.go | 6 +++--- src/segments/git_test.go | 6 +++--- src/segments/gitversion.go | 4 ++-- src/segments/gitversion_test.go | 4 ++-- src/segments/golang.go | 4 ++-- src/segments/golang_test.go | 6 +++--- src/segments/haskell.go | 4 ++-- src/segments/haskell_test.go | 6 +++--- src/segments/ipify.go | 6 +++--- src/segments/ipify_test.go | 2 +- src/segments/iterm.go | 4 ++-- src/segments/iterm_test.go | 2 +- src/segments/java.go | 4 ++-- src/segments/java_test.go | 4 ++-- src/segments/julia.go | 4 ++-- src/segments/kotlin.go | 4 ++-- src/segments/kubectl.go | 4 ++-- src/segments/kubectl_test.go | 6 +++--- src/segments/language.go | 8 ++++---- src/segments/language_test.go | 6 +++--- src/segments/lua.go | 4 ++-- src/segments/lua_test.go | 6 +++--- src/segments/nbgv.go | 4 ++-- src/segments/nbgv_test.go | 4 ++-- src/segments/nightscout.go | 4 ++-- src/segments/nightscout_test.go | 4 ++-- src/segments/node.go | 6 +++--- src/segments/node_test.go | 4 ++-- src/segments/npm.go | 4 ++-- src/segments/nx.go | 4 ++-- src/segments/nx_test.go | 4 ++-- src/segments/os.go | 4 ++-- src/segments/os_test.go | 6 +++--- src/segments/owm.go | 4 ++-- src/segments/owm_test.go | 4 ++-- src/segments/path.go | 10 +++++----- src/segments/path_test.go | 10 +++++----- src/segments/perl.go | 4 ++-- src/segments/perl_test.go | 4 ++-- src/segments/php.go | 4 ++-- src/segments/plastic.go | 6 +++--- src/segments/plastic_test.go | 6 +++--- src/segments/posh_git_test.go | 6 +++--- src/segments/project.go | 6 +++--- src/segments/project_test.go | 4 ++-- src/segments/python.go | 4 ++-- src/segments/python_test.go | 6 +++--- src/segments/r.go | 4 ++-- src/segments/r_test.go | 6 +++--- src/segments/root.go | 4 ++-- src/segments/ruby.go | 4 ++-- src/segments/ruby_test.go | 4 ++-- src/segments/rust.go | 4 ++-- src/segments/scm.go | 4 ++-- src/segments/scm_test.go | 6 +++--- src/segments/session.go | 4 ++-- src/segments/session_test.go | 6 +++--- src/segments/shell.go | 4 ++-- src/segments/shell_test.go | 6 +++--- src/segments/spotify.go | 4 ++-- src/segments/spotify_darwin_test.go | 4 ++-- src/segments/spotify_test.go | 4 ++-- src/segments/spotify_windows_test.go | 6 +++--- src/segments/spotify_wsl_test.go | 4 ++-- src/segments/strava.go | 6 +++--- src/segments/strava_test.go | 4 ++-- src/segments/svn.go | 2 +- src/segments/svn_test.go | 6 +++--- src/segments/swift.go | 4 ++-- src/segments/sysinfo.go | 4 ++-- src/segments/sysinfo_test.go | 4 ++-- src/segments/terraform.go | 4 ++-- src/segments/terraform_test.go | 4 ++-- src/segments/text.go | 4 ++-- src/segments/text_test.go | 4 ++-- src/segments/time.go | 4 ++-- src/segments/time_test.go | 4 ++-- src/segments/ui5tooling.go | 4 ++-- src/segments/ui5tooling_test.go | 6 +++--- src/segments/wakatime.go | 6 +++--- src/segments/wakatime_test.go | 6 +++--- src/segments/winreg.go | 4 ++-- src/segments/winreg_test.go | 6 +++--- src/segments/withings.go | 6 +++--- src/segments/withings_test.go | 4 ++-- src/segments/xmake.go | 4 ++-- src/segments/ytm.go | 4 ++-- src/segments/ytm_test.go | 4 ++-- src/shell/init.go | 4 ++-- src/shell/init_test.go | 4 ++-- src/template/files_test.go | 4 ++-- src/template/link_test.go | 4 ++-- src/template/list.go | 2 +- src/template/regex.go | 2 +- src/template/round_test.go | 4 ++-- src/template/text.go | 4 ++-- src/template/text_test.go | 4 ++-- 175 files changed, 400 insertions(+), 400 deletions(-) diff --git a/src/ansi/ansi_writer.go b/src/ansi/ansi_writer.go index 3923589e..6eb921f7 100644 --- a/src/ansi/ansi_writer.go +++ b/src/ansi/ansi_writer.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/jandedobbeleer/oh-my-posh/regex" - "github.com/jandedobbeleer/oh-my-posh/shell" + "github.com/jandedobbeleer/oh-my-posh/src/regex" + "github.com/jandedobbeleer/oh-my-posh/src/shell" "github.com/mattn/go-runewidth" ) diff --git a/src/ansi/ansi_writer_hyperlink.go b/src/ansi/ansi_writer_hyperlink.go index e1068b5b..dd844599 100644 --- a/src/ansi/ansi_writer_hyperlink.go +++ b/src/ansi/ansi_writer_hyperlink.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/jandedobbeleer/oh-my-posh/regex" - "github.com/jandedobbeleer/oh-my-posh/shell" + "github.com/jandedobbeleer/oh-my-posh/src/regex" + "github.com/jandedobbeleer/oh-my-posh/src/shell" "github.com/mattn/go-runewidth" ) diff --git a/src/ansi/ansi_writer_hyperlink_test.go b/src/ansi/ansi_writer_hyperlink_test.go index bdd7eaf7..5bee3ee4 100644 --- a/src/ansi/ansi_writer_hyperlink_test.go +++ b/src/ansi/ansi_writer_hyperlink_test.go @@ -3,7 +3,7 @@ package ansi import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/shell" + "github.com/jandedobbeleer/oh-my-posh/src/shell" "github.com/stretchr/testify/assert" ) diff --git a/src/ansi/ansi_writer_test.go b/src/ansi/ansi_writer_test.go index dd8d9f11..afc2a241 100644 --- a/src/ansi/ansi_writer_test.go +++ b/src/ansi/ansi_writer_test.go @@ -3,7 +3,7 @@ package ansi import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/shell" + "github.com/jandedobbeleer/oh-my-posh/src/shell" "github.com/stretchr/testify/assert" ) diff --git a/src/ansi/colors.go b/src/ansi/colors.go index e31f0d58..56e11b46 100644 --- a/src/ansi/colors.go +++ b/src/ansi/colors.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/platform" "github.com/gookit/color" ) diff --git a/src/ansi/colors_unix.go b/src/ansi/colors_unix.go index 57407937..49b85d95 100644 --- a/src/ansi/colors_unix.go +++ b/src/ansi/colors_unix.go @@ -2,7 +2,7 @@ package ansi -import "github.com/jandedobbeleer/oh-my-posh/platform" +import "github.com/jandedobbeleer/oh-my-posh/src/platform" func GetAccentColor(env platform.Environment) (*RGB, error) { return nil, &platform.NotImplemented{} diff --git a/src/ansi/colors_windows.go b/src/ansi/colors_windows.go index 744026d6..9ac956c9 100644 --- a/src/ansi/colors_windows.go +++ b/src/ansi/colors_windows.go @@ -3,7 +3,7 @@ package ansi import ( "errors" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/platform" "github.com/gookit/color" ) diff --git a/src/cli/cache.go b/src/cli/cache.go index 6e7c56de..f8f804c0 100644 --- a/src/cli/cache.go +++ b/src/cli/cache.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/platform" "github.com/spf13/cobra" ) diff --git a/src/cli/config_export.go b/src/cli/config_export.go index 283b428a..22c10c39 100644 --- a/src/cli/config_export.go +++ b/src/cli/config_export.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - "github.com/jandedobbeleer/oh-my-posh/engine" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/engine" + "github.com/jandedobbeleer/oh-my-posh/src/platform" "github.com/spf13/cobra" ) diff --git a/src/cli/config_export_image.go b/src/cli/config_export_image.go index 0589e889..61a8ae9f 100644 --- a/src/cli/config_export_image.go +++ b/src/cli/config_export_image.go @@ -3,10 +3,10 @@ package cli import ( "fmt" - "github.com/jandedobbeleer/oh-my-posh/ansi" - "github.com/jandedobbeleer/oh-my-posh/engine" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/shell" + "github.com/jandedobbeleer/oh-my-posh/src/ansi" + "github.com/jandedobbeleer/oh-my-posh/src/engine" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/shell" "github.com/spf13/cobra" ) diff --git a/src/cli/config_migrate.go b/src/cli/config_migrate.go index b162a31f..e0c6be78 100644 --- a/src/cli/config_migrate.go +++ b/src/cli/config_migrate.go @@ -3,8 +3,8 @@ package cli import ( "fmt" - "github.com/jandedobbeleer/oh-my-posh/engine" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/engine" + "github.com/jandedobbeleer/oh-my-posh/src/platform" "github.com/spf13/cobra" ) diff --git a/src/cli/debug.go b/src/cli/debug.go index 5ba40088..a30fd93a 100644 --- a/src/cli/debug.go +++ b/src/cli/debug.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/jandedobbeleer/oh-my-posh/ansi" - "github.com/jandedobbeleer/oh-my-posh/engine" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/shell" + "github.com/jandedobbeleer/oh-my-posh/src/ansi" + "github.com/jandedobbeleer/oh-my-posh/src/engine" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/shell" "github.com/spf13/cobra" ) diff --git a/src/cli/font.go b/src/cli/font.go index 8c7b5458..32197a78 100644 --- a/src/cli/font.go +++ b/src/cli/font.go @@ -3,8 +3,8 @@ package cli import ( "fmt" - "github.com/jandedobbeleer/oh-my-posh/font" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/font" + "github.com/jandedobbeleer/oh-my-posh/src/platform" "github.com/spf13/cobra" ) diff --git a/src/cli/get.go b/src/cli/get.go index 678be4e1..bcfdab47 100644 --- a/src/cli/get.go +++ b/src/cli/get.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "github.com/jandedobbeleer/oh-my-posh/ansi" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/ansi" + "github.com/jandedobbeleer/oh-my-posh/src/platform" color2 "github.com/gookit/color" "github.com/spf13/cobra" diff --git a/src/cli/init.go b/src/cli/init.go index 74d2d301..04eff61f 100644 --- a/src/cli/init.go +++ b/src/cli/init.go @@ -3,9 +3,9 @@ package cli import ( "fmt" - "github.com/jandedobbeleer/oh-my-posh/engine" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/shell" + "github.com/jandedobbeleer/oh-my-posh/src/engine" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/shell" "github.com/spf13/cobra" ) diff --git a/src/cli/print.go b/src/cli/print.go index d10a2a86..44c0e4db 100644 --- a/src/cli/print.go +++ b/src/cli/print.go @@ -3,8 +3,8 @@ package cli import ( "fmt" - "github.com/jandedobbeleer/oh-my-posh/engine" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/engine" + "github.com/jandedobbeleer/oh-my-posh/src/platform" "github.com/spf13/cobra" ) diff --git a/src/cli/toggle.go b/src/cli/toggle.go index bbee45ad..2de71091 100644 --- a/src/cli/toggle.go +++ b/src/cli/toggle.go @@ -3,7 +3,7 @@ package cli import ( "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/platform" "github.com/spf13/cobra" ) diff --git a/src/engine/block.go b/src/engine/block.go index 10815177..4d4323f6 100644 --- a/src/engine/block.go +++ b/src/engine/block.go @@ -4,9 +4,9 @@ import ( "sync" "time" - "github.com/jandedobbeleer/oh-my-posh/ansi" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/shell" + "github.com/jandedobbeleer/oh-my-posh/src/ansi" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/shell" ) // BlockType type of block diff --git a/src/engine/config.go b/src/engine/config.go index a7ab48a7..58b4b068 100644 --- a/src/engine/config.go +++ b/src/engine/config.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/jandedobbeleer/oh-my-posh/ansi" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" - "github.com/jandedobbeleer/oh-my-posh/segments" - "github.com/jandedobbeleer/oh-my-posh/template" + "github.com/jandedobbeleer/oh-my-posh/src/ansi" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" + "github.com/jandedobbeleer/oh-my-posh/src/segments" + "github.com/jandedobbeleer/oh-my-posh/src/template" "github.com/gookit/config/v2" "github.com/gookit/config/v2/json" diff --git a/src/engine/config_test.go b/src/engine/config_test.go index fcdf1c03..8a60c33a 100644 --- a/src/engine/config_test.go +++ b/src/engine/config_test.go @@ -3,10 +3,10 @@ package engine import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/ansi" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/segments" + "github.com/jandedobbeleer/oh-my-posh/src/ansi" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/segments" "github.com/gookit/config/v2" "github.com/mitchellh/mapstructure" diff --git a/src/engine/engine.go b/src/engine/engine.go index 13559453..af143b13 100644 --- a/src/engine/engine.go +++ b/src/engine/engine.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "github.com/jandedobbeleer/oh-my-posh/ansi" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/shell" - "github.com/jandedobbeleer/oh-my-posh/template" + "github.com/jandedobbeleer/oh-my-posh/src/ansi" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/shell" + "github.com/jandedobbeleer/oh-my-posh/src/template" ) type Engine struct { diff --git a/src/engine/engine_test.go b/src/engine/engine_test.go index dc5e8c0e..0ec1e065 100644 --- a/src/engine/engine_test.go +++ b/src/engine/engine_test.go @@ -4,10 +4,10 @@ import ( "errors" "testing" - "github.com/jandedobbeleer/oh-my-posh/ansi" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/shell" + "github.com/jandedobbeleer/oh-my-posh/src/ansi" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/shell" "github.com/stretchr/testify/assert" ) diff --git a/src/engine/image.go b/src/engine/image.go index cccaaad3..4a26187a 100644 --- a/src/engine/image.go +++ b/src/engine/image.go @@ -30,8 +30,8 @@ import ( "strings" "unicode/utf8" - "github.com/jandedobbeleer/oh-my-posh/ansi" - "github.com/jandedobbeleer/oh-my-posh/regex" + "github.com/jandedobbeleer/oh-my-posh/src/ansi" + "github.com/jandedobbeleer/oh-my-posh/src/regex" "github.com/esimov/stackblur-go" "github.com/fogleman/gg" diff --git a/src/engine/image_test.go b/src/engine/image_test.go index b989b192..2c6d17b8 100644 --- a/src/engine/image_test.go +++ b/src/engine/image_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "github.com/jandedobbeleer/oh-my-posh/ansi" - "github.com/jandedobbeleer/oh-my-posh/shell" + "github.com/jandedobbeleer/oh-my-posh/src/ansi" + "github.com/jandedobbeleer/oh-my-posh/src/shell" "github.com/stretchr/testify/assert" ) diff --git a/src/engine/migrate.go b/src/engine/migrate.go index 97a0fd8f..2a707a9f 100644 --- a/src/engine/migrate.go +++ b/src/engine/migrate.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" - "github.com/jandedobbeleer/oh-my-posh/segments" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" + "github.com/jandedobbeleer/oh-my-posh/src/segments" ) const ( diff --git a/src/engine/migrate_test.go b/src/engine/migrate_test.go index 275ab2a7..000a98c2 100644 --- a/src/engine/migrate_test.go +++ b/src/engine/migrate_test.go @@ -3,9 +3,9 @@ package engine import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/engine/new.go b/src/engine/new.go index 4ba2fd92..482b3f72 100644 --- a/src/engine/new.go +++ b/src/engine/new.go @@ -1,9 +1,9 @@ package engine import ( - "github.com/jandedobbeleer/oh-my-posh/ansi" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/shell" + "github.com/jandedobbeleer/oh-my-posh/src/ansi" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/shell" ) // New returns a prompt engine initialized with the diff --git a/src/engine/responsive.go b/src/engine/responsive.go index 7722107d..777ede4d 100644 --- a/src/engine/responsive.go +++ b/src/engine/responsive.go @@ -1,6 +1,6 @@ package engine -import "github.com/jandedobbeleer/oh-my-posh/platform" +import "github.com/jandedobbeleer/oh-my-posh/src/platform" func shouldHideForWidth(env platform.Environment, minWidth, maxWidth int) bool { if maxWidth == 0 && minWidth == 0 { diff --git a/src/engine/responsive_test.go b/src/engine/responsive_test.go index a7ecb1ab..4d7c54d6 100644 --- a/src/engine/responsive_test.go +++ b/src/engine/responsive_test.go @@ -3,7 +3,7 @@ package engine import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" + "github.com/jandedobbeleer/oh-my-posh/src/mock" "github.com/stretchr/testify/assert" ) diff --git a/src/engine/segment.go b/src/engine/segment.go index 66e2c36f..8410a5ec 100644 --- a/src/engine/segment.go +++ b/src/engine/segment.go @@ -7,11 +7,11 @@ import ( "strings" "time" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" - "github.com/jandedobbeleer/oh-my-posh/segments" - "github.com/jandedobbeleer/oh-my-posh/shell" - "github.com/jandedobbeleer/oh-my-posh/template" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" + "github.com/jandedobbeleer/oh-my-posh/src/segments" + "github.com/jandedobbeleer/oh-my-posh/src/shell" + "github.com/jandedobbeleer/oh-my-posh/src/template" c "golang.org/x/text/cases" "golang.org/x/text/language" diff --git a/src/engine/segment_test.go b/src/engine/segment_test.go index 34e03a5a..52176004 100644 --- a/src/engine/segment_test.go +++ b/src/engine/segment_test.go @@ -4,10 +4,10 @@ import ( "encoding/json" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" - "github.com/jandedobbeleer/oh-my-posh/segments" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" + "github.com/jandedobbeleer/oh-my-posh/src/segments" "github.com/stretchr/testify/assert" ) diff --git a/src/go.mod b/src/go.mod index e9386eb4..bf6f63ed 100644 --- a/src/go.mod +++ b/src/go.mod @@ -1,4 +1,4 @@ -module github.com/jandedobbeleer/oh-my-posh +module github.com/jandedobbeleer/oh-my-posh/src go 1.19 diff --git a/src/http/oauth.go b/src/http/oauth.go index f5480f36..902d3277 100644 --- a/src/http/oauth.go +++ b/src/http/oauth.go @@ -6,8 +6,8 @@ import ( "io" "net/http" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) const ( diff --git a/src/http/oauth_test.go b/src/http/oauth_test.go index 7cef06a3..f858047a 100644 --- a/src/http/oauth_test.go +++ b/src/http/oauth_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" mock2 "github.com/stretchr/testify/mock" diff --git a/src/http/request.go b/src/http/request.go index e1fc86b5..b3298e66 100644 --- a/src/http/request.go +++ b/src/http/request.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Request struct { diff --git a/src/http/request_test.go b/src/http/request_test.go index 4f7f4f4a..87584785 100644 --- a/src/http/request_test.go +++ b/src/http/request_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" mock2 "github.com/stretchr/testify/mock" diff --git a/src/main.go b/src/main.go index 79e42ba2..f9bd7aae 100644 --- a/src/main.go +++ b/src/main.go @@ -1,6 +1,6 @@ package main -import "github.com/jandedobbeleer/oh-my-posh/cli" +import "github.com/jandedobbeleer/oh-my-posh/src/cli" var ( Version = "development" diff --git a/src/main_test.go b/src/main_test.go index 80ef3a4b..332971bf 100644 --- a/src/main_test.go +++ b/src/main_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/jandedobbeleer/oh-my-posh/cli" + "github.com/jandedobbeleer/oh-my-posh/src/cli" ) func BenchmarkInit(b *testing.B) { diff --git a/src/mock/environment.go b/src/mock/environment.go index 8d41c790..a1cee653 100644 --- a/src/mock/environment.go +++ b/src/mock/environment.go @@ -5,8 +5,8 @@ import ( "io/fs" "time" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/platform/battery" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/platform/battery" mock "github.com/stretchr/testify/mock" ) diff --git a/src/platform/battery/battery_darwin.go b/src/platform/battery/battery_darwin.go index eda71ae1..bfe4021f 100644 --- a/src/platform/battery/battery_darwin.go +++ b/src/platform/battery/battery_darwin.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/jandedobbeleer/oh-my-posh/platform/cmd" - "github.com/jandedobbeleer/oh-my-posh/regex" + "github.com/jandedobbeleer/oh-my-posh/src/platform/cmd" + "github.com/jandedobbeleer/oh-my-posh/src/regex" ) func mapMostLogicalState(state string) State { diff --git a/src/platform/shell.go b/src/platform/shell.go index e00d8c54..36f47e2d 100644 --- a/src/platform/shell.go +++ b/src/platform/shell.go @@ -19,10 +19,10 @@ import ( "sync" "time" - "github.com/jandedobbeleer/oh-my-posh/log" - "github.com/jandedobbeleer/oh-my-posh/platform/battery" - "github.com/jandedobbeleer/oh-my-posh/platform/cmd" - "github.com/jandedobbeleer/oh-my-posh/regex" + "github.com/jandedobbeleer/oh-my-posh/src/log" + "github.com/jandedobbeleer/oh-my-posh/src/platform/battery" + "github.com/jandedobbeleer/oh-my-posh/src/platform/cmd" + "github.com/jandedobbeleer/oh-my-posh/src/regex" process "github.com/shirou/gopsutil/v3/process" ) diff --git a/src/platform/shell_darwin.go b/src/platform/shell_darwin.go index dbbd5fa9..045eeecd 100644 --- a/src/platform/shell_darwin.go +++ b/src/platform/shell_darwin.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/jandedobbeleer/oh-my-posh/regex" + "github.com/jandedobbeleer/oh-my-posh/src/regex" - "github.com/jandedobbeleer/oh-my-posh/platform/battery" + "github.com/jandedobbeleer/oh-my-posh/src/platform/battery" ) func mapMostLogicalState(state string) battery.State { diff --git a/src/platform/shell_windows_nix.go b/src/platform/shell_windows_nix.go index 16a6a35f..16e81c5c 100644 --- a/src/platform/shell_windows_nix.go +++ b/src/platform/shell_windows_nix.go @@ -5,7 +5,7 @@ package platform import ( "time" - "github.com/jandedobbeleer/oh-my-posh/platform/battery" + "github.com/jandedobbeleer/oh-my-posh/src/platform/battery" ) func (env *Shell) BatteryState() (*battery.Info, error) { diff --git a/src/platform/win32_windows.go b/src/platform/win32_windows.go index ae49ba90..17f6bb71 100644 --- a/src/platform/win32_windows.go +++ b/src/platform/win32_windows.go @@ -9,7 +9,7 @@ import ( "unicode/utf16" "unsafe" - "github.com/jandedobbeleer/oh-my-posh/regex" + "github.com/jandedobbeleer/oh-my-posh/src/regex" "golang.org/x/sys/windows" ) diff --git a/src/properties/properties.go b/src/properties/properties.go index 579c313b..74dfc9e0 100644 --- a/src/properties/properties.go +++ b/src/properties/properties.go @@ -3,8 +3,8 @@ package properties import ( "fmt" - "github.com/jandedobbeleer/oh-my-posh/ansi" - "github.com/jandedobbeleer/oh-my-posh/regex" + "github.com/jandedobbeleer/oh-my-posh/src/ansi" + "github.com/jandedobbeleer/oh-my-posh/src/regex" ) type Properties interface { diff --git a/src/segments/angular.go b/src/segments/angular.go index 0921bd26..5d642f09 100644 --- a/src/segments/angular.go +++ b/src/segments/angular.go @@ -3,8 +3,8 @@ package segments import ( "path/filepath" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Angular struct { diff --git a/src/segments/aws.go b/src/segments/aws.go index e8dc5ed2..e5e7562c 100644 --- a/src/segments/aws.go +++ b/src/segments/aws.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Aws struct { diff --git a/src/segments/aws_test.go b/src/segments/aws_test.go index acb0ab58..57e86f18 100644 --- a/src/segments/aws_test.go +++ b/src/segments/aws_test.go @@ -3,8 +3,8 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/az.go b/src/segments/az.go index 22e592d5..3d9aaaad 100644 --- a/src/segments/az.go +++ b/src/segments/az.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Az struct { diff --git a/src/segments/az_functions.go b/src/segments/az_functions.go index 115786b9..f7cf3795 100644 --- a/src/segments/az_functions.go +++ b/src/segments/az_functions.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type AzFunc struct { diff --git a/src/segments/az_test.go b/src/segments/az_test.go index 0b5f90ad..7cfb7c9d 100644 --- a/src/segments/az_test.go +++ b/src/segments/az_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/battery.go b/src/segments/battery.go index 15b66196..5539e203 100644 --- a/src/segments/battery.go +++ b/src/segments/battery.go @@ -1,9 +1,9 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/platform/battery" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/platform/battery" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Battery struct { diff --git a/src/segments/brewfather.go b/src/segments/brewfather.go index 9be5eb86..3e97a36e 100644 --- a/src/segments/brewfather.go +++ b/src/segments/brewfather.go @@ -10,8 +10,8 @@ import ( "sort" "time" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) // segment struct, makes templating easier diff --git a/src/segments/brewfather_test.go b/src/segments/brewfather_test.go index e40e63c0..adbb5324 100644 --- a/src/segments/brewfather_test.go +++ b/src/segments/brewfather_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/cds.go b/src/segments/cds.go index af0be2fa..60347ffb 100644 --- a/src/segments/cds.go +++ b/src/segments/cds.go @@ -3,8 +3,8 @@ package segments import ( "encoding/json" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Cds struct { diff --git a/src/segments/cds_test.go b/src/segments/cds_test.go index d72bfba7..18d7e369 100644 --- a/src/segments/cds_test.go +++ b/src/segments/cds_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/cf.go b/src/segments/cf.go index 22c38936..2d3c4b20 100644 --- a/src/segments/cf.go +++ b/src/segments/cf.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Cf struct { diff --git a/src/segments/cf_target.go b/src/segments/cf_target.go index 16217fc8..9ef8e0e8 100644 --- a/src/segments/cf_target.go +++ b/src/segments/cf_target.go @@ -3,8 +3,8 @@ package segments import ( "regexp" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type CfTarget struct { diff --git a/src/segments/cf_target_test.go b/src/segments/cf_target_test.go index 28f67d72..39047cba 100644 --- a/src/segments/cf_target_test.go +++ b/src/segments/cf_target_test.go @@ -5,8 +5,8 @@ import ( "os/exec" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/cf_test.go b/src/segments/cf_test.go index c513c3e0..7f3a7117 100644 --- a/src/segments/cf_test.go +++ b/src/segments/cf_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/cmake.go b/src/segments/cmake.go index f197dbc7..c47f8c39 100644 --- a/src/segments/cmake.go +++ b/src/segments/cmake.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Cmake struct { diff --git a/src/segments/command.go b/src/segments/command.go index 0cd67f28..9bd3c7e9 100644 --- a/src/segments/command.go +++ b/src/segments/command.go @@ -3,8 +3,8 @@ package segments import ( "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Cmd struct { diff --git a/src/segments/command_test.go b/src/segments/command_test.go index 5da3fe31..66f75a0a 100644 --- a/src/segments/command_test.go +++ b/src/segments/command_test.go @@ -3,8 +3,8 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/connection.go b/src/segments/connection.go index 50d40803..699f1043 100644 --- a/src/segments/connection.go +++ b/src/segments/connection.go @@ -3,8 +3,8 @@ package segments import ( "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Connection struct { diff --git a/src/segments/connection_test.go b/src/segments/connection_test.go index 0003f2b7..2ee67c7f 100644 --- a/src/segments/connection_test.go +++ b/src/segments/connection_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/crystal.go b/src/segments/crystal.go index dd734515..d1c41fb9 100644 --- a/src/segments/crystal.go +++ b/src/segments/crystal.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Crystal struct { diff --git a/src/segments/dart.go b/src/segments/dart.go index b2e23cc8..634c6eac 100644 --- a/src/segments/dart.go +++ b/src/segments/dart.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) var ( diff --git a/src/segments/deno.go b/src/segments/deno.go index 21539961..a85adc22 100644 --- a/src/segments/deno.go +++ b/src/segments/deno.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Deno struct { diff --git a/src/segments/dotnet.go b/src/segments/dotnet.go index 2808bb06..80807ae6 100644 --- a/src/segments/dotnet.go +++ b/src/segments/dotnet.go @@ -1,9 +1,9 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/constants" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/constants" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Dotnet struct { diff --git a/src/segments/dotnet_test.go b/src/segments/dotnet_test.go index 43d0a8fd..2be4fd7a 100644 --- a/src/segments/dotnet_test.go +++ b/src/segments/dotnet_test.go @@ -3,10 +3,10 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/constants" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/constants" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/executiontime.go b/src/segments/executiontime.go index 1ae9cb1d..8f523a78 100644 --- a/src/segments/executiontime.go +++ b/src/segments/executiontime.go @@ -4,8 +4,8 @@ import ( "fmt" "strconv" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" lang "golang.org/x/text/language" "golang.org/x/text/message" diff --git a/src/segments/executiontime_test.go b/src/segments/executiontime_test.go index 7a50d88e..a757a86c 100644 --- a/src/segments/executiontime_test.go +++ b/src/segments/executiontime_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/exit.go b/src/segments/exit.go index 4359200a..a0c6219c 100644 --- a/src/segments/exit.go +++ b/src/segments/exit.go @@ -3,8 +3,8 @@ package segments import ( "strconv" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Exit struct { diff --git a/src/segments/exit_test.go b/src/segments/exit_test.go index c57d1fa4..81c0b215 100644 --- a/src/segments/exit_test.go +++ b/src/segments/exit_test.go @@ -3,9 +3,9 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/flutter.go b/src/segments/flutter.go index 3c0c00d9..5ce2959f 100644 --- a/src/segments/flutter.go +++ b/src/segments/flutter.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Flutter struct { diff --git a/src/segments/fossil_test.go b/src/segments/fossil_test.go index bb26d147..abc51ca0 100644 --- a/src/segments/fossil_test.go +++ b/src/segments/fossil_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/gcp.go b/src/segments/gcp.go index 8d2ca388..e3a4cba9 100644 --- a/src/segments/gcp.go +++ b/src/segments/gcp.go @@ -4,8 +4,8 @@ import ( "errors" "path" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "gopkg.in/ini.v1" ) diff --git a/src/segments/gcp_test.go b/src/segments/gcp_test.go index 9f6729ca..67129093 100644 --- a/src/segments/gcp_test.go +++ b/src/segments/gcp_test.go @@ -4,8 +4,8 @@ import ( "path" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" "github.com/stretchr/testify/assert" mock2 "github.com/stretchr/testify/mock" diff --git a/src/segments/git.go b/src/segments/git.go index da2d2e00..0808e86f 100644 --- a/src/segments/git.go +++ b/src/segments/git.go @@ -7,9 +7,9 @@ import ( "strconv" "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" - "github.com/jandedobbeleer/oh-my-posh/regex" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" + "github.com/jandedobbeleer/oh-my-posh/src/regex" "gopkg.in/ini.v1" ) diff --git a/src/segments/git_test.go b/src/segments/git_test.go index 6c342af9..de755df9 100644 --- a/src/segments/git_test.go +++ b/src/segments/git_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/gitversion.go b/src/segments/gitversion.go index 20238b69..6e6aa1bb 100644 --- a/src/segments/gitversion.go +++ b/src/segments/gitversion.go @@ -4,8 +4,8 @@ import ( "encoding/json" "errors" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type gitVersion struct { diff --git a/src/segments/gitversion_test.go b/src/segments/gitversion_test.go index 4ba7a3e8..eb933e6e 100644 --- a/src/segments/gitversion_test.go +++ b/src/segments/gitversion_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/alecthomas/assert" mock2 "github.com/stretchr/testify/mock" diff --git a/src/segments/golang.go b/src/segments/golang.go index 2cb76ed8..f10fac6e 100644 --- a/src/segments/golang.go +++ b/src/segments/golang.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "golang.org/x/mod/modfile" ) diff --git a/src/segments/golang_test.go b/src/segments/golang_test.go index 02c57367..7667cbe7 100644 --- a/src/segments/golang_test.go +++ b/src/segments/golang_test.go @@ -6,9 +6,9 @@ import ( "os" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/haskell.go b/src/segments/haskell.go index 449d84aa..185a0693 100644 --- a/src/segments/haskell.go +++ b/src/segments/haskell.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Haskell struct { diff --git a/src/segments/haskell_test.go b/src/segments/haskell_test.go index 1468707d..2c336f54 100644 --- a/src/segments/haskell_test.go +++ b/src/segments/haskell_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/ipify.go b/src/segments/ipify.go index 9bd6a2b8..55546e53 100644 --- a/src/segments/ipify.go +++ b/src/segments/ipify.go @@ -3,9 +3,9 @@ package segments import ( "net" - "github.com/jandedobbeleer/oh-my-posh/http" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/http" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type ipData struct { diff --git a/src/segments/ipify_test.go b/src/segments/ipify_test.go index 3eb8f91f..3b515d07 100644 --- a/src/segments/ipify_test.go +++ b/src/segments/ipify_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" + "github.com/jandedobbeleer/oh-my-posh/src/mock" "github.com/stretchr/testify/assert" mock2 "github.com/stretchr/testify/mock" diff --git a/src/segments/iterm.go b/src/segments/iterm.go index 781918d6..2f38cffa 100644 --- a/src/segments/iterm.go +++ b/src/segments/iterm.go @@ -3,8 +3,8 @@ package segments import ( "errors" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type ITerm struct { diff --git a/src/segments/iterm_test.go b/src/segments/iterm_test.go index f815a491..c90a5c99 100644 --- a/src/segments/iterm_test.go +++ b/src/segments/iterm_test.go @@ -3,7 +3,7 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" + "github.com/jandedobbeleer/oh-my-posh/src/mock" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/java.go b/src/segments/java.go index 302da76b..6a8c9b13 100644 --- a/src/segments/java.go +++ b/src/segments/java.go @@ -3,8 +3,8 @@ package segments import ( "fmt" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Java struct { diff --git a/src/segments/java_test.go b/src/segments/java_test.go index 1f03e52f..d8628494 100644 --- a/src/segments/java_test.go +++ b/src/segments/java_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/julia.go b/src/segments/julia.go index 0f7a76d7..37dad893 100644 --- a/src/segments/julia.go +++ b/src/segments/julia.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Julia struct { diff --git a/src/segments/kotlin.go b/src/segments/kotlin.go index 24715351..8360ccff 100644 --- a/src/segments/kotlin.go +++ b/src/segments/kotlin.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Kotlin struct { diff --git a/src/segments/kubectl.go b/src/segments/kubectl.go index 70da2016..3d46cbed 100644 --- a/src/segments/kubectl.go +++ b/src/segments/kubectl.go @@ -3,8 +3,8 @@ package segments import ( "path/filepath" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "gopkg.in/yaml.v3" ) diff --git a/src/segments/kubectl_test.go b/src/segments/kubectl_test.go index 10089bca..129c2522 100644 --- a/src/segments/kubectl_test.go +++ b/src/segments/kubectl_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/language.go b/src/segments/language.go index 1cb8bd1c..4ab55d2b 100644 --- a/src/segments/language.go +++ b/src/segments/language.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" - "github.com/jandedobbeleer/oh-my-posh/regex" - "github.com/jandedobbeleer/oh-my-posh/template" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" + "github.com/jandedobbeleer/oh-my-posh/src/regex" + "github.com/jandedobbeleer/oh-my-posh/src/template" ) const ( diff --git a/src/segments/language_test.go b/src/segments/language_test.go index 8dcde670..e027d5d6 100644 --- a/src/segments/language_test.go +++ b/src/segments/language_test.go @@ -3,9 +3,9 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/lua.go b/src/segments/lua.go index 8e8c9593..214ded2c 100644 --- a/src/segments/lua.go +++ b/src/segments/lua.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Lua struct { diff --git a/src/segments/lua_test.go b/src/segments/lua_test.go index 5c6b246d..e390ed66 100644 --- a/src/segments/lua_test.go +++ b/src/segments/lua_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/nbgv.go b/src/segments/nbgv.go index 6812ae21..f655d49f 100644 --- a/src/segments/nbgv.go +++ b/src/segments/nbgv.go @@ -3,8 +3,8 @@ package segments import ( "encoding/json" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Nbgv struct { diff --git a/src/segments/nbgv_test.go b/src/segments/nbgv_test.go index 4f7f0353..7ecff4f9 100644 --- a/src/segments/nbgv_test.go +++ b/src/segments/nbgv_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/alecthomas/assert" ) diff --git a/src/segments/nightscout.go b/src/segments/nightscout.go index 082e9da4..0786846f 100644 --- a/src/segments/nightscout.go +++ b/src/segments/nightscout.go @@ -5,8 +5,8 @@ import ( "errors" "time" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) // segment struct, makes templating easier diff --git a/src/segments/nightscout_test.go b/src/segments/nightscout_test.go index 0e2b3037..29bb6686 100644 --- a/src/segments/nightscout_test.go +++ b/src/segments/nightscout_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/node.go b/src/segments/node.go index 8c6030d8..06a31b65 100644 --- a/src/segments/node.go +++ b/src/segments/node.go @@ -3,9 +3,9 @@ package segments import ( "fmt" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" - "github.com/jandedobbeleer/oh-my-posh/regex" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" + "github.com/jandedobbeleer/oh-my-posh/src/regex" ) type Node struct { diff --git a/src/segments/node_test.go b/src/segments/node_test.go index a1934a58..d5ee3078 100644 --- a/src/segments/node_test.go +++ b/src/segments/node_test.go @@ -3,8 +3,8 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/alecthomas/assert" ) diff --git a/src/segments/npm.go b/src/segments/npm.go index 3883ed8c..4be48969 100644 --- a/src/segments/npm.go +++ b/src/segments/npm.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Npm struct { diff --git a/src/segments/nx.go b/src/segments/nx.go index 9c757edd..82b79948 100644 --- a/src/segments/nx.go +++ b/src/segments/nx.go @@ -5,8 +5,8 @@ import ( "fmt" "path/filepath" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Nx struct { diff --git a/src/segments/nx_test.go b/src/segments/nx_test.go index 70881d71..54e7e5ce 100644 --- a/src/segments/nx_test.go +++ b/src/segments/nx_test.go @@ -4,8 +4,8 @@ import ( "path/filepath" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/os.go b/src/segments/os.go index fbe91546..f3c9b69a 100644 --- a/src/segments/os.go +++ b/src/segments/os.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Os struct { diff --git a/src/segments/os_test.go b/src/segments/os_test.go index a585dd96..79c74a13 100644 --- a/src/segments/os_test.go +++ b/src/segments/os_test.go @@ -3,9 +3,9 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/owm.go b/src/segments/owm.go index 522a3467..4c8cbcbe 100644 --- a/src/segments/owm.go +++ b/src/segments/owm.go @@ -6,8 +6,8 @@ import ( "fmt" "math" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Owm struct { diff --git a/src/segments/owm_test.go b/src/segments/owm_test.go index 4ac6c106..d9bf6cfb 100644 --- a/src/segments/owm_test.go +++ b/src/segments/owm_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/path.go b/src/segments/path.go index cd905043..5cb32a14 100644 --- a/src/segments/path.go +++ b/src/segments/path.go @@ -5,11 +5,11 @@ import ( "sort" "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" - "github.com/jandedobbeleer/oh-my-posh/regex" - "github.com/jandedobbeleer/oh-my-posh/shell" - "github.com/jandedobbeleer/oh-my-posh/template" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" + "github.com/jandedobbeleer/oh-my-posh/src/regex" + "github.com/jandedobbeleer/oh-my-posh/src/shell" + "github.com/jandedobbeleer/oh-my-posh/src/template" ) type Path struct { diff --git a/src/segments/path_test.go b/src/segments/path_test.go index 791b6754..2e5b41d4 100644 --- a/src/segments/path_test.go +++ b/src/segments/path_test.go @@ -4,11 +4,11 @@ import ( "strings" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" - "github.com/jandedobbeleer/oh-my-posh/shell" - "github.com/jandedobbeleer/oh-my-posh/template" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" + "github.com/jandedobbeleer/oh-my-posh/src/shell" + "github.com/jandedobbeleer/oh-my-posh/src/template" "github.com/stretchr/testify/assert" mock2 "github.com/stretchr/testify/mock" diff --git a/src/segments/perl.go b/src/segments/perl.go index 2100c6c9..826010d6 100644 --- a/src/segments/perl.go +++ b/src/segments/perl.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Perl struct { diff --git a/src/segments/perl_test.go b/src/segments/perl_test.go index e200d431..a16ff0d5 100644 --- a/src/segments/perl_test.go +++ b/src/segments/perl_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/php.go b/src/segments/php.go index 1d80f9c6..86f9bbfc 100644 --- a/src/segments/php.go +++ b/src/segments/php.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Php struct { diff --git a/src/segments/plastic.go b/src/segments/plastic.go index 25163041..fc1c0f02 100644 --- a/src/segments/plastic.go +++ b/src/segments/plastic.go @@ -5,9 +5,9 @@ import ( "strconv" "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" - "github.com/jandedobbeleer/oh-my-posh/regex" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" + "github.com/jandedobbeleer/oh-my-posh/src/regex" ) type PlasticStatus struct { diff --git a/src/segments/plastic_test.go b/src/segments/plastic_test.go index ec71942e..ab97a127 100644 --- a/src/segments/plastic_test.go +++ b/src/segments/plastic_test.go @@ -3,9 +3,9 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/posh_git_test.go b/src/segments/posh_git_test.go index 2814bb78..a82ae2c9 100644 --- a/src/segments/posh_git_test.go +++ b/src/segments/posh_git_test.go @@ -3,9 +3,9 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/project.go b/src/segments/project.go index 3dbc391d..db1d6d00 100644 --- a/src/segments/project.go +++ b/src/segments/project.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" - "github.com/jandedobbeleer/oh-my-posh/regex" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" + "github.com/jandedobbeleer/oh-my-posh/src/regex" "github.com/BurntSushi/toml" ) diff --git a/src/segments/project_test.go b/src/segments/project_test.go index d84e74b7..8b96ba8d 100644 --- a/src/segments/project_test.go +++ b/src/segments/project_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/alecthomas/assert" diff --git a/src/segments/python.go b/src/segments/python.go index b4998918..6bfb70e1 100644 --- a/src/segments/python.go +++ b/src/segments/python.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Python struct { diff --git a/src/segments/python_test.go b/src/segments/python_test.go index 8b7454b5..7be39ba9 100644 --- a/src/segments/python_test.go +++ b/src/segments/python_test.go @@ -4,9 +4,9 @@ import ( "errors" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/alecthomas/assert" mock2 "github.com/stretchr/testify/mock" diff --git a/src/segments/r.go b/src/segments/r.go index 65d03743..4b6f883e 100644 --- a/src/segments/r.go +++ b/src/segments/r.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type R struct { diff --git a/src/segments/r_test.go b/src/segments/r_test.go index 28581d87..ba71c33b 100644 --- a/src/segments/r_test.go +++ b/src/segments/r_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/root.go b/src/segments/root.go index 1a850228..27be4bf0 100644 --- a/src/segments/root.go +++ b/src/segments/root.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Root struct { diff --git a/src/segments/ruby.go b/src/segments/ruby.go index 4a05c595..f2cbe751 100644 --- a/src/segments/ruby.go +++ b/src/segments/ruby.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Ruby struct { diff --git a/src/segments/ruby_test.go b/src/segments/ruby_test.go index e42339f4..9b9482a3 100644 --- a/src/segments/ruby_test.go +++ b/src/segments/ruby_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/rust.go b/src/segments/rust.go index 125b44ed..9835e2af 100644 --- a/src/segments/rust.go +++ b/src/segments/rust.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Rust struct { diff --git a/src/segments/scm.go b/src/segments/scm.go index 70e55a84..d346834d 100644 --- a/src/segments/scm.go +++ b/src/segments/scm.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) const ( diff --git a/src/segments/scm_test.go b/src/segments/scm_test.go index d910f2fa..fbf8831a 100644 --- a/src/segments/scm_test.go +++ b/src/segments/scm_test.go @@ -3,9 +3,9 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/session.go b/src/segments/session.go index 32524a9a..59a5be55 100644 --- a/src/segments/session.go +++ b/src/segments/session.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Session struct { diff --git a/src/segments/session_test.go b/src/segments/session_test.go index 5febd2dc..ddf7039d 100644 --- a/src/segments/session_test.go +++ b/src/segments/session_test.go @@ -3,9 +3,9 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/shell.go b/src/segments/shell.go index 8f35632d..e8295e33 100644 --- a/src/segments/shell.go +++ b/src/segments/shell.go @@ -3,8 +3,8 @@ package segments import ( "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Shell struct { diff --git a/src/segments/shell_test.go b/src/segments/shell_test.go index d017c45c..2e1e3bbb 100644 --- a/src/segments/shell_test.go +++ b/src/segments/shell_test.go @@ -3,9 +3,9 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/spotify.go b/src/segments/spotify.go index 4b260d2d..ab9ab1f8 100644 --- a/src/segments/spotify.go +++ b/src/segments/spotify.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Spotify struct { diff --git a/src/segments/spotify_darwin_test.go b/src/segments/spotify_darwin_test.go index 676fd36b..99520709 100644 --- a/src/segments/spotify_darwin_test.go +++ b/src/segments/spotify_darwin_test.go @@ -6,8 +6,8 @@ import ( "errors" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/spotify_test.go b/src/segments/spotify_test.go index fb9c402a..81493f67 100644 --- a/src/segments/spotify_test.go +++ b/src/segments/spotify_test.go @@ -3,8 +3,8 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/spotify_windows_test.go b/src/segments/spotify_windows_test.go index 965b5c14..f2f9d2ba 100644 --- a/src/segments/spotify_windows_test.go +++ b/src/segments/spotify_windows_test.go @@ -5,9 +5,9 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/spotify_wsl_test.go b/src/segments/spotify_wsl_test.go index 561dd536..0c3e0c33 100644 --- a/src/segments/spotify_wsl_test.go +++ b/src/segments/spotify_wsl_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/strava.go b/src/segments/strava.go index baae3c59..6791e516 100644 --- a/src/segments/strava.go +++ b/src/segments/strava.go @@ -5,9 +5,9 @@ import ( "math" "time" - "github.com/jandedobbeleer/oh-my-posh/http" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/http" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) // StravaAPI is a wrapper around http.Oauth diff --git a/src/segments/strava_test.go b/src/segments/strava_test.go index ffe52e44..5032b1b0 100644 --- a/src/segments/strava_test.go +++ b/src/segments/strava_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" mock2 "github.com/stretchr/testify/mock" diff --git a/src/segments/svn.go b/src/segments/svn.go index 6b0901a9..111ccaf5 100644 --- a/src/segments/svn.go +++ b/src/segments/svn.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/jandedobbeleer/oh-my-posh/regex" + "github.com/jandedobbeleer/oh-my-posh/src/regex" ) // SvnStatus represents part of the status of a Svn repository diff --git a/src/segments/svn_test.go b/src/segments/svn_test.go index 25f8506f..6c9ac393 100644 --- a/src/segments/svn_test.go +++ b/src/segments/svn_test.go @@ -3,9 +3,9 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/swift.go b/src/segments/swift.go index 3b05258e..169b54a3 100644 --- a/src/segments/swift.go +++ b/src/segments/swift.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Swift struct { diff --git a/src/segments/sysinfo.go b/src/segments/sysinfo.go index 2990ad85..31d5cb11 100644 --- a/src/segments/sysinfo.go +++ b/src/segments/sysinfo.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" cpu "github.com/shirou/gopsutil/v3/cpu" disk "github.com/shirou/gopsutil/v3/disk" diff --git a/src/segments/sysinfo_test.go b/src/segments/sysinfo_test.go index ac56f68e..dc97d03a 100644 --- a/src/segments/sysinfo_test.go +++ b/src/segments/sysinfo_test.go @@ -3,8 +3,8 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/shirou/gopsutil/v3/cpu" "github.com/stretchr/testify/assert" diff --git a/src/segments/terraform.go b/src/segments/terraform.go index 93d40791..d4a9ad2b 100644 --- a/src/segments/terraform.go +++ b/src/segments/terraform.go @@ -5,8 +5,8 @@ import ( "errors" "path/filepath" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/hashicorp/hcl/v2/gohcl" "github.com/hashicorp/hcl/v2/hclparse" diff --git a/src/segments/terraform_test.go b/src/segments/terraform_test.go index 6c7f5630..3a2c2486 100644 --- a/src/segments/terraform_test.go +++ b/src/segments/terraform_test.go @@ -4,8 +4,8 @@ import ( "os" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/text.go b/src/segments/text.go index 4b6d3102..e376edee 100644 --- a/src/segments/text.go +++ b/src/segments/text.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Text struct { diff --git a/src/segments/text_test.go b/src/segments/text_test.go index 9b1c4a6f..a3989ac4 100644 --- a/src/segments/text_test.go +++ b/src/segments/text_test.go @@ -3,8 +3,8 @@ package segments import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/time.go b/src/segments/time.go index cf09d137..33cb658e 100644 --- a/src/segments/time.go +++ b/src/segments/time.go @@ -3,8 +3,8 @@ package segments import ( "time" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Time struct { diff --git a/src/segments/time_test.go b/src/segments/time_test.go index 1273e0a7..6055e440 100644 --- a/src/segments/time_test.go +++ b/src/segments/time_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/ui5tooling.go b/src/segments/ui5tooling.go index e9b0b774..bee17645 100644 --- a/src/segments/ui5tooling.go +++ b/src/segments/ui5tooling.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) const UI5ToolingYamlPattern = "*ui5*.y*ml" diff --git a/src/segments/ui5tooling_test.go b/src/segments/ui5tooling_test.go index 450dbade..b5da9121 100644 --- a/src/segments/ui5tooling_test.go +++ b/src/segments/ui5tooling_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/wakatime.go b/src/segments/wakatime.go index f63233de..0cfbaed8 100644 --- a/src/segments/wakatime.go +++ b/src/segments/wakatime.go @@ -3,9 +3,9 @@ package segments import ( "encoding/json" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" - "github.com/jandedobbeleer/oh-my-posh/template" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" + "github.com/jandedobbeleer/oh-my-posh/src/template" ) type Wakatime struct { diff --git a/src/segments/wakatime_test.go b/src/segments/wakatime_test.go index 8b1e0147..24d2be00 100644 --- a/src/segments/wakatime_test.go +++ b/src/segments/wakatime_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" mock2 "github.com/stretchr/testify/mock" diff --git a/src/segments/winreg.go b/src/segments/winreg.go index 671eeac8..92af05f7 100644 --- a/src/segments/winreg.go +++ b/src/segments/winreg.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type WindowsRegistry struct { diff --git a/src/segments/winreg_test.go b/src/segments/winreg_test.go index 6a65e63e..16da0868 100644 --- a/src/segments/winreg_test.go +++ b/src/segments/winreg_test.go @@ -4,9 +4,9 @@ import ( "errors" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/segments/withings.go b/src/segments/withings.go index 30d829a5..4969a0bb 100644 --- a/src/segments/withings.go +++ b/src/segments/withings.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/jandedobbeleer/oh-my-posh/http" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/http" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" http2 "net/http" "net/url" diff --git a/src/segments/withings_test.go b/src/segments/withings_test.go index 6071d357..30c7834e 100644 --- a/src/segments/withings_test.go +++ b/src/segments/withings_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" mock2 "github.com/stretchr/testify/mock" diff --git a/src/segments/xmake.go b/src/segments/xmake.go index 5c7fa0c6..12c22e3c 100644 --- a/src/segments/xmake.go +++ b/src/segments/xmake.go @@ -1,8 +1,8 @@ package segments import ( - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type XMake struct { diff --git a/src/segments/ytm.go b/src/segments/ytm.go index 8a4b32d5..9a7a8200 100644 --- a/src/segments/ytm.go +++ b/src/segments/ytm.go @@ -3,8 +3,8 @@ package segments import ( "encoding/json" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/properties" ) type Ytm struct { diff --git a/src/segments/ytm_test.go b/src/segments/ytm_test.go index beb13640..d14cbbe7 100644 --- a/src/segments/ytm_test.go +++ b/src/segments/ytm_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/properties" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/properties" "github.com/stretchr/testify/assert" ) diff --git a/src/shell/init.go b/src/shell/init.go index 9bbc82d8..15c0a717 100644 --- a/src/shell/init.go +++ b/src/shell/init.go @@ -9,8 +9,8 @@ import ( "os" "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/template" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/template" ) //go:embed scripts/omp.ps1 diff --git a/src/shell/init_test.go b/src/shell/init_test.go index 6deee10a..19cb922e 100644 --- a/src/shell/init_test.go +++ b/src/shell/init_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" "github.com/stretchr/testify/assert" ) diff --git a/src/template/files_test.go b/src/template/files_test.go index 26022e17..8eec68b1 100644 --- a/src/template/files_test.go +++ b/src/template/files_test.go @@ -3,8 +3,8 @@ package template import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" "github.com/stretchr/testify/assert" ) diff --git a/src/template/link_test.go b/src/template/link_test.go index 31ead18a..81d5d8c6 100644 --- a/src/template/link_test.go +++ b/src/template/link_test.go @@ -3,8 +3,8 @@ package template import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" "github.com/stretchr/testify/assert" mock2 "github.com/stretchr/testify/mock" diff --git a/src/template/list.go b/src/template/list.go index 8a4a4e70..b4e33687 100644 --- a/src/template/list.go +++ b/src/template/list.go @@ -3,7 +3,7 @@ package template import ( "strings" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/platform" ) type Logic string diff --git a/src/template/regex.go b/src/template/regex.go index 00e635f1..75757a18 100644 --- a/src/template/regex.go +++ b/src/template/regex.go @@ -1,6 +1,6 @@ package template -import "github.com/jandedobbeleer/oh-my-posh/regex" +import "github.com/jandedobbeleer/oh-my-posh/src/regex" func matchP(pattern, text string) bool { return regex.MatchString(pattern, text) diff --git a/src/template/round_test.go b/src/template/round_test.go index df0d1e89..b1e6b7d6 100644 --- a/src/template/round_test.go +++ b/src/template/round_test.go @@ -3,8 +3,8 @@ package template import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" "github.com/stretchr/testify/assert" mock2 "github.com/stretchr/testify/mock" diff --git a/src/template/text.go b/src/template/text.go index 739351a8..f78dcbc1 100644 --- a/src/template/text.go +++ b/src/template/text.go @@ -6,8 +6,8 @@ import ( "strings" "text/template" - "github.com/jandedobbeleer/oh-my-posh/platform" - "github.com/jandedobbeleer/oh-my-posh/regex" + "github.com/jandedobbeleer/oh-my-posh/src/platform" + "github.com/jandedobbeleer/oh-my-posh/src/regex" ) const ( diff --git a/src/template/text_test.go b/src/template/text_test.go index 0be147b7..023d60d4 100644 --- a/src/template/text_test.go +++ b/src/template/text_test.go @@ -3,8 +3,8 @@ package template import ( "testing" - "github.com/jandedobbeleer/oh-my-posh/mock" - "github.com/jandedobbeleer/oh-my-posh/platform" + "github.com/jandedobbeleer/oh-my-posh/src/mock" + "github.com/jandedobbeleer/oh-my-posh/src/platform" "github.com/stretchr/testify/assert" mock2 "github.com/stretchr/testify/mock"