Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package glow for openSUSE:Factory checked in at 2023-06-04 16:42:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glow (Old) and /work/SRC/openSUSE:Factory/.glow.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glow" Sun Jun 4 16:42:23 2023 rev:2 rq:1090745 version:1.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/glow/glow.changes 2023-03-17 17:03:04.305306096 +0100 +++ /work/SRC/openSUSE:Factory/.glow.new.15902/glow.changes 2023-06-04 16:42:59.706269905 +0200 @@ -1,0 +2,12 @@ +Wed May 31 02:04:53 UTC 2023 - Joshua Smith <[email protected]> + +- Update to version 1.5.1: + - docs: fix typos by @kianmeng in #471 + - fix: rm emoji from package description by @caarlos0 in #453 + - fix: improve editor handling by @caarlos0 in #449 + - fix: lazily init UI by @muesli in #494 + - fix-for-go-117.patch added as vendoring was incorrect + Ran the patch against the source before manually doing + go mod download/verify/vendor and packaging. + +------------------------------------------------------------------- Old: ---- glow-1.5.0.tar.gz New: ---- fix-for-go-117.patch glow-1.5.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glow.spec ++++++ --- /var/tmp/diff_new_pack.udLETt/_old 2023-06-04 16:43:00.466274428 +0200 +++ /var/tmp/diff_new_pack.udLETt/_new 2023-06-04 16:43:00.474274476 +0200 @@ -20,7 +20,7 @@ # Disable LTO flags to stop builds failing on some architectures %global _lto_cflags %nil Name: glow -Version: 1.5.0 +Version: 1.5.1 Release: 0 Summary: Render markdown on the CLI # @@ -35,9 +35,10 @@ # Source2: README.suse-maint.md # -BuildRequires: zstd +Patch1: fix-for-go-117.patch BuildRequires: golang-packaging -BuildRequires: golang(API) >= 1.11 +BuildRequires: zstd +BuildRequires: golang(API) >= 1.17 %description Glow is a terminal based markdown reader designed from the ground up to bring @@ -60,7 +61,7 @@ export CGO_CFLAGS="%{optflags}" export CGO_CXXFLAGS="%{optflags}" export CGO_CPPFLAGS="%{optflags}" -go build -v -x -mod=vendor $BUILDMOD -a -ldflags "-s -X main.revision=%{version}" +go build -v -x -mod=vendor $BUILDMOD -a -ldflags "-s -X main.Version=%{version}" %install install -Dm755 %{name} %{buildroot}%{_bindir}/%{name} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.udLETt/_old 2023-06-04 16:43:00.526274785 +0200 +++ /var/tmp/diff_new_pack.udLETt/_new 2023-06-04 16:43:00.530274809 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/charmbracelet/glow</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v1.4.1</param> + <param name="revision">v1.5.1</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> </service> @@ -15,6 +15,7 @@ <param name="compression">gz</param> </service> <service name="go_modules" mode="disabled"> + <param name="compression">zst</param> </service> </services> ++++++ fix-for-go-117.patch ++++++ --- a/go.mod 2023-05-30 21:34:02.914986538 -0400 +++ b/go.mod 2023-05-30 21:33:56.099249432 -0400 @@ -1,6 +1,6 @@ module github.com/charmbracelet/glow -go 1.16 +go 1.17 require ( github.com/atotto/clipboard v0.1.4 @@ -25,3 +25,47 @@ golang.org/x/term v0.7.0 golang.org/x/text v0.9.0 ) + +require ( + github.com/alecthomas/chroma v0.10.0 // indirect + github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect + github.com/aymerick/douceur v0.2.0 // indirect + github.com/calmh/randomart v1.1.0 // indirect + github.com/containerd/console v1.0.3 // indirect + github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect + github.com/dlclark/regexp2 v1.4.0 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/gorilla/css v1.0.0 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.0.1 // indirect + github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/magiconair/properties v1.8.6 // indirect + github.com/mattn/go-isatty v0.0.18 // indirect + github.com/mattn/go-localereader v0.0.1 // indirect + github.com/microcosm-cc/bluemonday v1.0.21 // indirect + github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect + github.com/muesli/cancelreader v0.2.2 // indirect + github.com/muesli/sasquatch v0.0.0-20200811221207-66979d92330a // indirect + github.com/olekukonko/tablewriter v0.0.5 // indirect + github.com/pelletier/go-toml v1.9.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.5 // indirect + github.com/rivo/uniseg v0.2.0 // indirect + github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 // indirect + github.com/spf13/afero v1.9.2 // indirect + github.com/spf13/cast v1.5.0 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/subosito/gotenv v1.4.1 // indirect + github.com/yuin/goldmark v1.5.2 // indirect + github.com/yuin/goldmark-emoji v1.0.1 // indirect + golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect + golang.org/x/net v0.6.0 // indirect + golang.org/x/sync v0.1.0 // indirect + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) ++++++ glow-1.5.0.tar.gz -> glow-1.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glow-1.5.0/.github/workflows/coverage.yml new/glow-1.5.1/.github/workflows/coverage.yml --- old/glow-1.5.0/.github/workflows/coverage.yml 2023-01-23 17:41:06.000000000 +0100 +++ new/glow-1.5.1/.github/workflows/coverage.yml 2023-05-09 11:16:02.000000000 +0200 @@ -12,7 +12,7 @@ GO111MODULE: "on" steps: - name: Install Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: go-version: ${{ matrix.go-version }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glow-1.5.0/.goreleaser.yml new/glow-1.5.1/.goreleaser.yml --- old/glow-1.5.0/.goreleaser.yml 2023-01-23 17:41:06.000000000 +0100 +++ new/glow-1.5.1/.goreleaser.yml 2023-05-09 11:16:02.000000000 +0200 @@ -5,7 +5,7 @@ variables: main: "." binary_name: glow - description: "Render markdown on the CLI, with pizzazz! ð ð»" + description: "Render markdown on the CLI, with pizzazz!" github_url: "https://github.com/charmbracelet/soft-serve"; maintainer: "Christian Muehlhaeuser <[email protected]>" brew_commit_author_name: "Christian Muehlhaeuser" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glow-1.5.0/config_cmd.go new/glow-1.5.1/config_cmd.go --- old/glow-1.5.0/config_cmd.go 2023-01-23 17:41:06.000000000 +0100 +++ new/glow-1.5.1/config_cmd.go 2023-05-09 11:16:02.000000000 +0200 @@ -1,14 +1,12 @@ package main import ( - "errors" "fmt" "os" - "os/exec" "path" "path/filepath" - "strings" + "github.com/charmbracelet/glow/editor" gap "github.com/muesli/go-app-paths" "github.com/spf13/cobra" ) @@ -32,11 +30,6 @@ Example: paragraph("glow config\nglow config --config path/to/config.yml"), Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) error { - editor := strings.Fields(os.Getenv("EDITOR")) - if len(editor) == 0 { - return errors.New("no EDITOR environment variable set") - } - if configFile == "" { scope := gap.NewScope(gap.User, "glow") @@ -71,11 +64,7 @@ return err } - var eargs []string - if len(editor) > 1 { - eargs = editor[1:] - } - c := exec.Command(editor[0], append(eargs, configFile)...) // nolint: gosec + c := editor.Cmd(configFile) c.Stdin = os.Stdin c.Stdout = os.Stdout c.Stderr = os.Stderr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glow-1.5.0/editor/editor.go new/glow-1.5.1/editor/editor.go --- old/glow-1.5.0/editor/editor.go 1970-01-01 01:00:00.000000000 +0100 +++ new/glow-1.5.1/editor/editor.go 2023-05-09 11:16:02.000000000 +0200 @@ -0,0 +1,27 @@ +package editor + +import ( + "os" + "os/exec" + "strings" +) + +const defaultEditor = "nano" + +// Cmd returns a *exec.Cmd editing the given path with $EDITOR or nano if no +// $EDITOR is set. +func Cmd(path string) *exec.Cmd { + editor, args := getEditor() + return exec.Command(editor, append(args, path)...) +} + +func getEditor() (string, []string) { + editor := strings.Fields(os.Getenv("EDITOR")) + if len(editor) > 1 { + return editor[0], editor[1:] + } + if len(editor) == 1 { + return editor[0], []string{} + } + return defaultEditor, []string{} +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glow-1.5.0/editor/editor_test.go new/glow-1.5.1/editor/editor_test.go --- old/glow-1.5.0/editor/editor_test.go 1970-01-01 01:00:00.000000000 +0100 +++ new/glow-1.5.1/editor/editor_test.go 2023-05-09 11:16:02.000000000 +0200 @@ -0,0 +1,26 @@ +package editor + +import ( + "reflect" + "testing" +) + +func TestEditor(t *testing.T) { + filename := "README.md" + for k, v := range map[string][]string{ + "": {"nano", filename}, + "nvim": {"nvim", filename}, + "vim": {"vim", filename}, + "vscode --foo": {"vscode", "--foo", filename}, + "nvim -a -b": {"nvim", "-a", "-b", filename}, + } { + t.Run(k, func(t *testing.T) { + t.Setenv("EDITOR", k) + cmd := Cmd("README.md") + got := cmd.Args + if !reflect.DeepEqual(got, v) { + t.Fatalf("expected %v; got %v", v, got) + } + }) + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glow-1.5.0/go.mod new/glow-1.5.1/go.mod --- old/glow-1.5.0/go.mod 2023-01-23 17:41:06.000000000 +0100 +++ new/glow-1.5.1/go.mod 2023-05-09 11:16:02.000000000 +0200 @@ -5,8 +5,8 @@ require ( github.com/atotto/clipboard v0.1.4 github.com/charmbracelet/bubbles v0.15.0 - github.com/charmbracelet/bubbletea v0.23.1 - github.com/charmbracelet/charm v0.8.6 + github.com/charmbracelet/bubbletea v0.23.2 + github.com/charmbracelet/charm v0.8.7 github.com/charmbracelet/glamour v0.6.0 github.com/charmbracelet/lipgloss v0.6.0 github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac @@ -16,12 +16,12 @@ github.com/muesli/gitcha v0.2.0 github.com/muesli/go-app-paths v0.2.2 github.com/muesli/reflow v0.3.0 - github.com/muesli/termenv v0.13.0 + github.com/muesli/termenv v0.15.1 github.com/sahilm/fuzzy v0.1.0 github.com/segmentio/ksuid v1.0.4 github.com/spf13/cobra v1.6.1 github.com/spf13/viper v1.14.0 - golang.org/x/sys v0.0.0-20220908164124-27713097b956 - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 - golang.org/x/text v0.6.0 + golang.org/x/sys v0.7.0 + golang.org/x/term v0.7.0 + golang.org/x/text v0.9.0 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glow-1.5.0/go.sum new/glow-1.5.1/go.sum --- old/glow-1.5.0/go.sum 2023-01-23 17:41:06.000000000 +0100 +++ new/glow-1.5.1/go.sum 2023-05-09 11:16:02.000000000 +0200 @@ -203,8 +203,11 @@ github.com/atotto/clipboard v0.1.2/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= -github.com/aymanbagabas/go-osc52 v1.0.3 h1:DTwqENW7X9arYimJrPeGZcV0ln14sGMt3pHZspWD+Mg= github.com/aymanbagabas/go-osc52 v1.0.3/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4= +github.com/aymanbagabas/go-osc52 v1.2.1 h1:q2sWUyDcozPLcLabEMd+a+7Ea2DitxZVN9hTxab9L4E= +github.com/aymanbagabas/go-osc52 v1.2.1/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4= +github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= +github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -221,10 +224,11 @@ github.com/charmbracelet/bubbles v0.15.0 h1:c5vZ3woHV5W2b8YZI1q7v4ZNQaPetfHuoHzx+56Z6TI= github.com/charmbracelet/bubbles v0.15.0/go.mod h1:Y7gSFbBzlMpUDR/XM9MhZI374Q+1p1kluf1uLl8iK74= github.com/charmbracelet/bubbletea v0.12.2/go.mod h1:3gZkYELUOiEUOp0bTInkxguucy/xRbGSOcbMs1geLxg= -github.com/charmbracelet/bubbletea v0.23.1 h1:CYdteX1wCiCzKNUlwm25ZHBIc1GXlYFyUIte8WPvhck= github.com/charmbracelet/bubbletea v0.23.1/go.mod h1:JAfGK/3/pPKHTnAS8JIE2u9f61BjWTQY57RbT25aMXU= -github.com/charmbracelet/charm v0.8.6 h1:/U6rxGj4J6zZ1Ex8+wTr4hNMr4ESBzNZbC1UyrJPVbg= -github.com/charmbracelet/charm v0.8.6/go.mod h1:8dE3uX+TYSpa7Q6e/CmjN6WSd7koSAKNQTGWugFREx4= +github.com/charmbracelet/bubbletea v0.23.2 h1:vuUJ9HJ7b/COy4I30e8xDVQ+VRDUEFykIjryPfgsdps= +github.com/charmbracelet/bubbletea v0.23.2/go.mod h1:FaP3WUivcTM0xOKNmhciz60M6I+weYLF76mr1JyI7sM= +github.com/charmbracelet/charm v0.8.7 h1:FJ9b7IxWUWHOPR72zS/QJLEqtudOB2Mwfc+Sir0eZR8= +github.com/charmbracelet/charm v0.8.7/go.mod h1:ApJYwJljEjODkOYJgFDzbUqztLrCWQct9zyPD+xcVr4= github.com/charmbracelet/glamour v0.6.0 h1:wi8fse3Y7nfcabbbDuwolqTqMQPMnVPeZhDM273bISc= github.com/charmbracelet/glamour v0.6.0/go.mod h1:taqWV4swIMMbWALc0m7AfE9JkPSU8om2538k9ITBxOc= github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao= @@ -487,11 +491,12 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= +github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4= github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88= -github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= @@ -532,7 +537,6 @@ github.com/muesli/go-app-paths v0.2.1/go.mod h1:SxS3Umca63pcFcLtbjVb+J0oD7cl4ixQWoBKhGEtEho= github.com/muesli/go-app-paths v0.2.2 h1:NqG4EEZwNIhBq/pREgfBmgDmt3h1Smr1MjZiXbpZUnI= github.com/muesli/go-app-paths v0.2.2/go.mod h1:SxS3Umca63pcFcLtbjVb+J0oD7cl4ixQWoBKhGEtEho= -github.com/muesli/reflow v0.1.0/go.mod h1:I9bWAt7QTg/que/qmUCJBGlj7wEq8OAFBjPNjc6xK4I= github.com/muesli/reflow v0.2.1-0.20210115123740-9e1d0d53df68/go.mod h1:Xk+z4oIWdQqJzsxyjgl3P22oYZnHdZ8FFTHAQQt5BMQ= github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= @@ -541,8 +545,10 @@ github.com/muesli/termenv v0.7.2/go.mod h1:ct2L5N2lmix82RaY3bMWwVu/jUFc9Ule0KGDCiKYPh8= github.com/muesli/termenv v0.7.4/go.mod h1:pZ7qY9l3F7e5xsAOS0zCew2tME+p7bWeBkotCEcIIcc= github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs= -github.com/muesli/termenv v0.13.0 h1:wK20DRpJdDX8b7Ek2QfhvqhRQFZ237RGRO0RQ/Iqdy0= github.com/muesli/termenv v0.13.0/go.mod h1:sP1+uffeLaEYpyOTb8pLCUctGcGLnoFjSn4YJK5e2bc= +github.com/muesli/termenv v0.14.0/go.mod h1:kG/pF1E7fh949Xhe156crRUrHNyK221IuGO7Ez60Uc8= +github.com/muesli/termenv v0.15.1 h1:UzuTb/+hhlBugQz28rpzey4ZuKcZ03MeKsoG7IJZIxs= +github.com/muesli/termenv v0.15.1/go.mod h1:HeAQPTzpfs016yGtA4g00CsdYnVLJvxsS4ANqrZs2sQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -736,6 +742,7 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -791,8 +798,9 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -831,6 +839,7 @@ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -920,11 +929,16 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956 h1:XeJjHH1KiLpKGb6lvMiksZ9l0fVUh+AmGcm0nOMEBOY= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= +golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -935,8 +949,9 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -998,6 +1013,7 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glow-1.5.0/style.go new/glow-1.5.1/style.go --- old/glow-1.5.0/style.go 2023-01-23 17:41:06.000000000 +0100 +++ new/glow-1.5.1/style.go 2023-05-09 11:16:02.000000000 +0200 @@ -4,7 +4,7 @@ var ( keyword = NewStyle(). - Foreground(AdaptiveColor{Light: "#04B575", Dark: "#04B575"}). + Foreground(Color("#04B575")). Render paragraph = NewStyle(). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glow-1.5.0/ui/editor.go new/glow-1.5.1/ui/editor.go --- old/glow-1.5.0/ui/editor.go 2023-01-23 17:41:06.000000000 +0100 +++ new/glow-1.5.1/ui/editor.go 2023-05-09 11:16:02.000000000 +0200 @@ -1,33 +1,15 @@ package ui import ( - "os" - "os/exec" - "strings" - tea "github.com/charmbracelet/bubbletea" + "github.com/charmbracelet/glow/editor" ) -const defaultEditor = "nano" - type editorFinishedMsg struct{ err error } func openEditor(path string) tea.Cmd { - editor, args := getEditor() - cmd := exec.Command(editor, append(args, path)...) cb := func(err error) tea.Msg { return editorFinishedMsg{err} } - return tea.ExecProcess(cmd, cb) -} - -func getEditor() (string, []string) { - editor := strings.Fields(os.Getenv("EDITOR")) - if len(editor) > 1 { - return editor[0], editor[1:] - } - if len(editor) == 1 { - return editor[0], []string{} - } - return defaultEditor, []string{} + return tea.ExecProcess(editor.Cmd(path), cb) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glow-1.5.0/ui/markdown.go new/glow-1.5.1/ui/markdown.go --- old/glow-1.5.0/ui/markdown.go 2023-01-23 17:41:06.000000000 +0100 +++ new/glow-1.5.1/ui/markdown.go 2023-05-09 11:16:02.000000000 +0200 @@ -134,7 +134,7 @@ return m[i].CreatedAt.After(m[j].CreatedAt) } - // If the times also match, sort by unqiue ID. + // If the times also match, sort by unique ID. ids := []ksuid.KSUID{m[i].uniqueID, m[j].uniqueID} ksuid.Sort(ids) return ids[0] == m[i].uniqueID diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glow-1.5.0/ui/pager.go new/glow-1.5.1/ui/pager.go --- old/glow-1.5.0/ui/pager.go 2023-01-23 17:41:06.000000000 +0100 +++ new/glow-1.5.1/ui/pager.go 2023-05-09 11:16:02.000000000 +0200 @@ -32,7 +32,7 @@ Foreground(cream). Background(green). Padding(0, 1). - Render("Set Memo") + SetString("Set Memo") statusBarNoteFg = lipgloss.AdaptiveColor{Light: "#656565", Dark: "#7D7D7D"} statusBarBg = lipgloss.AdaptiveColor{Light: "#E6E6E6", Dark: "#242424"} @@ -96,7 +96,7 @@ Background(yellowGreen) pagerNoteInputCursorStyle = lipgloss.NewStyle(). - Foreground(fuschia) + Foreground(fuchsia) ) type ( @@ -168,7 +168,7 @@ m.viewport.Width = w m.viewport.Height = h - statusBarHeight m.textInput.Width = w - - ansi.PrintableRuneWidth(noteHeading) - + ansi.PrintableRuneWidth(noteHeading.String()) - ansi.PrintableRuneWidth(m.textInput.Prompt) - 1 if m.showHelp { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glow-1.5.0/ui/stash.go new/glow-1.5.1/ui/stash.go --- old/glow-1.5.0/ui/stash.go 2023-01-23 17:41:06.000000000 +0100 +++ new/glow-1.5.1/ui/stash.go 2023-05-09 11:16:02.000000000 +0200 @@ -34,13 +34,13 @@ ) var ( - dividerDot = darkGrayFg(" ⢠") - dividerBar = darkGrayFg(" â ") - offlineHeaderNote = darkGrayFg("(Offline)") + dividerDot = darkGrayFg.SetString(" ⢠") + dividerBar = darkGrayFg.SetString(" â ") + offlineHeaderNote = darkGrayFg.SetString("(Offline)") logoStyle = lipgloss.NewStyle(). Foreground(lipgloss.Color("#ECFD65")). - Background(fuschia). + Background(fuchsia). Bold(true) stashSpinnerStyle = lipgloss.NewStyle(). @@ -49,7 +49,7 @@ Foreground(yellowGreen). MarginRight(1) stashInputCursorStyle = lipgloss.NewStyle(). - Foreground(fuschia). + Foreground(fuchsia). MarginRight(1) ) @@ -98,28 +98,7 @@ } // map sections to their associated types. -var sections = map[sectionKey]section{ - localSection: { - key: localSection, - docTypes: NewDocTypeSet(LocalDoc), - paginator: newStashPaginator(), - }, - stashedSection: { - key: stashedSection, - docTypes: NewDocTypeSet(StashedDoc, ConvertedDoc), - paginator: newStashPaginator(), - }, - newsSection: { - key: newsSection, - docTypes: NewDocTypeSet(NewsDoc), - paginator: newStashPaginator(), - }, - filterSection: { - key: filterSection, - docTypes: DocTypeSet{}, - paginator: newStashPaginator(), - }, -} +var sections = map[sectionKey]section{} // filterState is the current filtering state in the file listing. type filterState int @@ -155,6 +134,31 @@ message string } +func initSections() { + sections = map[sectionKey]section{ + localSection: { + key: localSection, + docTypes: NewDocTypeSet(LocalDoc), + paginator: newStashPaginator(), + }, + stashedSection: { + key: stashedSection, + docTypes: NewDocTypeSet(StashedDoc, ConvertedDoc), + paginator: newStashPaginator(), + }, + newsSection: { + key: newsSection, + docTypes: NewDocTypeSet(NewsDoc), + paginator: newStashPaginator(), + }, + filterSection: { + key: filterSection, + docTypes: DocTypeSet{}, + paginator: newStashPaginator(), + }, + } +} + // String returns a styled version of the status message appropriate for the // given context. func (s statusMessage) String() string { @@ -560,10 +564,10 @@ } func newStashPaginator() paginator.Model { - p := paginator.NewModel() + p := paginator.New() p.Type = paginator.Dots p.ActiveDot = brightGrayFg("â¢") - p.InactiveDot = darkGrayFg("â¢") + p.InactiveDot = darkGrayFg.Render("â¢") return p } @@ -1255,13 +1259,13 @@ sections[i] = grayFg(sections[i]) } - return strings.Join(sections, dividerDot) + return strings.Join(sections, dividerDot.String()) } if m.loadingDone() && len(m.markdowns) == 0 { var maybeOffline string if m.common.authStatus == authFailed { - maybeOffline = " " + offlineHeaderNote + maybeOffline = " " + offlineHeaderNote.String() } if m.stashedOnly() { @@ -1302,9 +1306,9 @@ sections = append(sections, s) } - s := strings.Join(sections, dividerBar) + s := strings.Join(sections, dividerBar.String()) if m.common.authStatus == authFailed { - s += dividerDot + offlineHeaderNote + s += dividerDot.String() + offlineHeaderNote.String() } return s diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glow-1.5.0/ui/stashhelp.go new/glow-1.5.1/ui/stashhelp.go --- old/glow-1.5.0/ui/stashhelp.go 2023-01-23 17:41:06.000000000 +0100 +++ new/glow-1.5.1/ui/stashhelp.go 2023-05-09 11:16:02.000000000 +0200 @@ -15,7 +15,7 @@ type helpColumn []helpEntry // newHelpColumn creates a help column from pairs of string arguments -// represeting keys and values. If the arguments are not even (and therein +// representing keys and values. If the arguments are not even (and therein // not every key has a matching value) the function will panic. func newHelpColumn(pairs ...string) (h helpColumn) { if len(pairs)%2 != 0 { @@ -193,7 +193,7 @@ } // Builds the help view from various sections pieces, truncating it if the view -// would otherwise wrap to two lines. Help view entires should come in as pairs, +// would otherwise wrap to two lines. Help view entries should come in as pairs, // with the first being the key and the second being the help text. func (m stashModel) miniHelpView(entries ...string) string { if len(entries) == 0 { @@ -231,7 +231,7 @@ next = fmt.Sprintf("%s %s", k, v) if i < len(entries)-2 { - next += dividerDot + next += dividerDot.String() } // Only this (and the following) help text items if we have the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glow-1.5.0/ui/stashitem.go new/glow-1.5.1/ui/stashitem.go --- old/glow-1.5.0/ui/stashitem.go 2023-01-23 17:41:06.000000000 +0100 +++ new/glow-1.5.1/ui/stashitem.go 2023-05-09 11:16:02.000000000 +0200 @@ -76,7 +76,7 @@ icon = dullFuchsiaFg(icon) if m.currentSection().key == filterSection && m.filterState == filterApplied || singleFilteredItem { - s := lipgloss.NewStyle().Foreground(fuschia) + s := lipgloss.NewStyle().Foreground(fuchsia) title = styleFilteredText(title, m.filterInput.Value(), s, s.Copy().Underline(true)) } else { title = fuchsiaFg(title) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glow-1.5.0/ui/styles.go new/glow-1.5.1/ui/styles.go --- old/glow-1.5.0/ui/styles.go 2023-01-23 17:41:06.000000000 +0100 +++ new/glow-1.5.1/ui/styles.go 2023-05-09 11:16:02.000000000 +0200 @@ -18,7 +18,7 @@ cream = AdaptiveColor{Light: "#FFFDF5", Dark: "#FFFDF5"} yellowGreen = AdaptiveColor{Light: "#04B575", Dark: "#ECFD65"} dullYellowGreen = AdaptiveColor{Light: "#6BCB94", Dark: "#9BA92F"} - fuschia = AdaptiveColor{Light: "#EE6FF8", Dark: "#EE6FF8"} + fuchsia = AdaptiveColor{Light: "#EE6FF8", Dark: "#EE6FF8"} dimFuchsia = AdaptiveColor{Light: "#F1A8FF", Dark: "#99519E"} dullFuchsia = AdaptiveColor{Dark: "#AD58B4", Light: "#F793FF"} dimDullFuchsia = AdaptiveColor{Light: "#F6C9FF", Dark: "#6B3A6F"} @@ -41,19 +41,19 @@ grayFg = NewStyle().Foreground(gray).Render midGrayFg = NewStyle().Foreground(midGray).Render - darkGrayFg = NewStyle().Foreground(darkGray).Render + darkGrayFg = NewStyle().Foreground(darkGray) greenFg = NewStyle().Foreground(green).Render semiDimGreenFg = NewStyle().Foreground(semiDimGreen).Render dimGreenFg = NewStyle().Foreground(dimGreen).Render - fuchsiaFg = NewStyle().Foreground(fuschia).Render + fuchsiaFg = NewStyle().Foreground(fuchsia).Render dimFuchsiaFg = NewStyle().Foreground(dimFuchsia).Render dullFuchsiaFg = NewStyle().Foreground(dullFuchsia).Render dimDullFuchsiaFg = NewStyle().Foreground(dimDullFuchsia).Render - indigoFg = NewStyle().Foreground(fuschia).Render + indigoFg = NewStyle().Foreground(fuchsia).Render dimIndigoFg = NewStyle().Foreground(dimIndigo).Render subtleIndigoFg = NewStyle().Foreground(subtleIndigo).Render diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glow-1.5.0/ui/ui.go new/glow-1.5.1/ui/ui.go --- old/glow-1.5.0/ui/ui.go 2023-01-23 17:41:06.000000000 +0100 +++ new/glow-1.5.1/ui/ui.go 2023-05-09 11:16:02.000000000 +0200 @@ -91,7 +91,7 @@ } ) -// applicationContext indicates the area of the application something appies +// applicationContext indicates the area of the application something applies // to. Occasionally used as an argument to commands and messages. type applicationContext int @@ -199,6 +199,8 @@ } func newModel(cfg Config) tea.Model { + initSections() + if cfg.GlamourStyle == "auto" { if te.HasDarkBackground() { cfg.GlamourStyle = "dark" @@ -620,7 +622,7 @@ return keygenFailedMsg{err} } if debug { - log.Println("keys generated succcessfully") + log.Println("keys generated successfully") } return keygenSuccessMsg{} } ++++++ vendor.tar.zst ++++++ Binary files /var/tmp/diff_new_pack.udLETt/_old and /var/tmp/diff_new_pack.udLETt/_new differ
