Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chezmoi for openSUSE:Factory checked
in at 2023-07-05 15:31:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chezmoi (Old)
and /work/SRC/openSUSE:Factory/.chezmoi.new.23466 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chezmoi"
Wed Jul 5 15:31:02 2023 rev:28 rq:1096842 version:2.34.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/chezmoi/chezmoi.changes 2023-06-20
16:48:42.291486366 +0200
+++ /work/SRC/openSUSE:Factory/.chezmoi.new.23466/chezmoi.changes
2023-07-05 15:31:18.666833653 +0200
@@ -1,0 +2,10 @@
+Tue Jul 4 17:01:14 UTC 2023 - Filippo Bonazzi <filippo.bona...@suse.com>
+
+- Update to version 2.34.3:
+ * fix: Check .chezmoiignore before protected paths
+ * fix: Parse hostnames from all loopback addresses in /etc/hosts
+ * fix: Respect persistentState config variable
+ * chore: Miscellaneous fixes
+ * chore: Update dependencies
+
+-------------------------------------------------------------------
Old:
----
chezmoi-2.34.2.obscpio
New:
----
chezmoi-2.34.3.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chezmoi.spec ++++++
--- /var/tmp/diff_new_pack.wUys7o/_old 2023-07-05 15:31:19.986841484 +0200
+++ /var/tmp/diff_new_pack.wUys7o/_new 2023-07-05 15:31:19.990841508 +0200
@@ -17,7 +17,7 @@
Name: chezmoi
-Version: 2.34.2
+Version: 2.34.3
Release: 0
Summary: A multi-host manager for dotfiles
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.wUys7o/_old 2023-07-05 15:31:20.030841745 +0200
+++ /var/tmp/diff_new_pack.wUys7o/_new 2023-07-05 15:31:20.034841770 +0200
@@ -2,7 +2,7 @@
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://github.com/twpayne/chezmoi.git</param>
- <param name="revision">v2.34.2</param>
+ <param name="revision">v2.34.3</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>
++++++ chezmoi-2.34.2.obscpio -> chezmoi-2.34.3.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/.gitattributes
new/chezmoi-2.34.3/.gitattributes
--- old/chezmoi-2.34.2/.gitattributes 2023-06-17 02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/.gitattributes 2023-07-03 09:12:43.000000000 +0200
@@ -2,4 +2,5 @@
# Make GitHub language breakdown more accurate, see
https://github.com/github/linguist
assets/scripts/install.sh linguist-generated
+assets/scripts/install-local-bin.sh linguist-generated
completions/* linguist-generated
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/.github/workflows/govulncheck.yml
new/chezmoi-2.34.3/.github/workflows/govulncheck.yml
--- old/chezmoi-2.34.2/.github/workflows/govulncheck.yml 2023-06-17
02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/.github/workflows/govulncheck.yml 2023-07-03
09:12:43.000000000 +0200
@@ -10,7 +10,7 @@
- name: go-version
id: go-version
run: |
- echo go-version="$(awk '/GO_VERSION:/ { print $2 }'
.github/workflows/main.yml | tr -d \')" >> ${GITHUB_OUTPUT}
+ echo go-version="$(awk '/GO_VERSION:/ { print $2 }'
.github/workflows/main.yml | tr -d \')" >> "${GITHUB_OUTPUT}"
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
with:
go-version: ${{ steps.go-version.outputs.go-version }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/.github/workflows/main.yml
new/chezmoi-2.34.3/.github/workflows/main.yml
--- old/chezmoi-2.34.2/.github/workflows/main.yml 2023-06-17
02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/.github/workflows/main.yml 2023-07-03
09:12:43.000000000 +0200
@@ -9,11 +9,14 @@
tags:
- v*
env:
+ ACTIONLINT_VERSION: 1.6.25
AGE_VERSION: 1.1.1
GO_VERSION: 1.20.5
GOFUMPT_VERSION: 0.4.0
GOLANGCI_LINT_VERSION: 1.53.3
+ GOLINES_VERSION: 0.11.0
GOVERSIONINFO_VERSION: 1.4.0
+ FINDTYPOS_VERSION: 0.0.1
jobs:
changes:
runs-on: ubuntu-20.04
@@ -47,15 +50,15 @@
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
with:
fetch-depth: 1
- - uses: github/codeql-action/init@6c089f53dd51dc3fc7e599c3cb5356453a52ca9e
+ - uses: github/codeql-action/init@f6e388ebf0efc915c6c5b165b019ee61a6746a38
with:
languages: go
- - uses:
github/codeql-action/analyze@6c089f53dd51dc3fc7e599c3cb5356453a52ca9e
+ - uses:
github/codeql-action/analyze@f6e388ebf0efc915c6c5b165b019ee61a6746a38
misspell:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
- - uses: reviewdog/action-misspell@ccb0441a34ac2a3ece1206c63d7b6dd757ffde4d
+ - uses: reviewdog/action-misspell@9257f108197b44e37995c98bea6ee4a5b9ffc3b0
with:
locale: US
test-alpine:
@@ -108,7 +111,7 @@
( cd assets/docker && ./test.sh fedora )
test-freebsd:
needs: changes
- if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
+ if: false
runs-on: macos-12
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
@@ -138,8 +141,8 @@
go run . --version
- name: install-age
run: |
- cd $(mktemp -d)
- curl -fsSL
https://github.com/FiloSottile/age/releases/download/v${AGE_VERSION}/age-v${AGE_VERSION}-darwin-amd64.tar.gz
| tar xzf -
+ cd "$(mktemp -d)"
+ curl -fsSL
"https://github.com/FiloSottile/age/releases/download/v${AGE_VERSION}/age-v${AGE_VERSION}-darwin-amd64.tar.gz";
| tar xzf -
sudo install -m 755 age/age /usr/local/bin
sudo install -m 755 age/age-keygen /usr/local/bin
- name: test
@@ -168,8 +171,8 @@
go run . --version
- name: install-age
run: |
- cd $(mktemp -d)
- curl -fsSL
https://github.com/FiloSottile/age/releases/download/v${AGE_VERSION}/age-v${AGE_VERSION}-linux-amd64.tar.gz
| tar xzf -
+ cd "$(mktemp -d)"
+ curl -fsSL
"https://github.com/FiloSottile/age/releases/download/v${AGE_VERSION}/age-v${AGE_VERSION}-linux-amd64.tar.gz";
| tar xzf -
sudo install -m 755 age/age /usr/local/bin
sudo install -m 755 age/age-keygen /usr/local/bin
- name: test
@@ -194,8 +197,8 @@
sudo apt-get --no-install-suggests --no-install-recommends --quiet
--yes install musl-tools snapcraft
# https://github.com/goreleaser/goreleaser/issues/1715
# https://bugs.launchpad.net/snapcraft/+bug/1889741
- mkdir -p $HOME/.cache/snapcraft/download
- mkdir -p $HOME/.cache/snapcraft/stage-packages
+ mkdir -p "${HOME}/.cache/snapcraft/download"
+ mkdir -p "${HOME}/.cache/snapcraft/stage-packages"
- name: create-syso
run: |
make create-syso
@@ -248,8 +251,8 @@
- name: install-age
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
run: |
- cd $(mktemp -d)
- curl -fsSL
https://github.com/FiloSottile/age/releases/download/v${AGE_VERSION}/age-v${AGE_VERSION}-linux-amd64.tar.gz
| tar xzf -
+ cd "$(mktemp -d)"
+ curl -fsSL
"https://github.com/FiloSottile/age/releases/download/v${AGE_VERSION}/age-v${AGE_VERSION}-linux-amd64.tar.gz";
| tar xzf -
sudo install -m 755 age/age /usr/local/bin
sudo install -m 755 age/age-keygen /usr/local/bin
- name: build
@@ -341,6 +344,10 @@
run: |
go generate
git diff --exit-code
+ - name: actionlint
+ run: |
+ go install
"github.com/rhysd/actionlint/cmd/actionlint@v${ACTIONLINT_VERSION}"
+ actionlint
- uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38
with:
ignore_paths: completions
@@ -349,10 +356,10 @@
go run ./internal/cmds/lint-whitespace
- name: lint-txtar
run: |
- find . -name \*.txtar | xargs go run ./internal/cmds/lint-txtar
+ find . -name '*.txtar' -print0 | xargs -0 go run
./internal/cmds/lint-txtar
- name: findtypos
run: |
- go install github.com/twpayne/findtypos@v0.0.1
+ go install "github.com/twpayne/findtypos@v${FINDTYPOS_VERSION}"
findtypos -format=github-actions chezmoi .
lint:
needs: changes
@@ -376,7 +383,6 @@
- test-archlinux
- test-debian-i386
- test-fedora
- - test-freebsd
- test-macos
- test-oldstable-go
- test-release
@@ -391,8 +397,8 @@
sudo apt-get --no-install-suggests --no-install-recommends --quiet
--yes install musl-tools snapcraft
# https://github.com/goreleaser/goreleaser/issues/1715
# https://bugs.launchpad.net/snapcraft/+bug/1889741
- mkdir -p $HOME/.cache/snapcraft/download
- mkdir -p $HOME/.cache/snapcraft/stage-packages
+ mkdir -p "${HOME}/.cache/snapcraft/download"
+ mkdir -p "${HOME}/.cache/snapcraft/stage-packages"
- name: check-snapcraft-credentials
run: snapcraft whoami
env:
@@ -403,7 +409,7 @@
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
with:
go-version: ${{ env.GO_VERSION }}
- - uses: sigstore/cosign-installer@dd6b2e2b610a11fd73dd187a43d57cc1394e35f9
+ - uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06
- name: create-syso
run: |
make create-syso
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/.gitignore
new/chezmoi-2.34.3/.gitignore
--- old/chezmoi-2.34.2/.gitignore 2023-06-17 02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/.gitignore 2023-07-03 09:12:43.000000000 +0200
@@ -1,6 +1,8 @@
/.vagrant
/COMMIT
+/bin/actionlint
/bin/chezmoi
+/bin/findtypos
/bin/gofumpt
/bin/golines
/bin/golangci-lint
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/.goreleaser.yaml
new/chezmoi-2.34.3/.goreleaser.yaml
--- old/chezmoi-2.34.2/.goreleaser.yaml 2023-06-17 02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/.goreleaser.yaml 2023-07-03 09:12:43.000000000 +0200
@@ -43,10 +43,8 @@
goos:
- darwin
- freebsd
- - illumos
- linux
- openbsd
- - solaris
- windows
goarch:
- '386'
@@ -94,7 +92,6 @@
format_overrides:
- goos: windows
format: zip
- rlcp: true
- id: glibc
builds:
- chezmoi-cgo-glibc
@@ -103,7 +100,6 @@
- README.md
- completions/*
name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}-glibc_{{ .Arch
}}'
- rlcp: true
- id: musl
builds:
- chezmoi-cgo-musl
@@ -112,7 +108,6 @@
- README.md
- completions/*
name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}-musl_{{ .Arch }}'
- rlcp: true
changelog:
use: github-native
@@ -207,7 +202,7 @@
name_template: chezmoi-windows-amd64.exe
scoops:
-- bucket:
+- repository:
owner: twpayne
name: scoop-bucket
token: '{{ .Env.SCOOP_GITHUB_TOKEN }}'
@@ -249,4 +244,3 @@
prefix_template: '{{ .ProjectName }}-{{ .Version }}/'
files:
- COMMIT
- rlcp: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/Makefile new/chezmoi-2.34.3/Makefile
--- old/chezmoi-2.34.2/Makefile 2023-06-17 02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/Makefile 2023-07-03 09:12:43.000000000 +0200
@@ -1,6 +1,9 @@
GO?=go
+ACTIONLINT_VERSION=$(shell awk '/ACTIONLINT_VERSION:/ { print $$2 }'
.github/workflows/main.yml)
+FINDTYPOS_VERSION=$(shell awk '/FINDTYPOS_VERSION:/ { print $$2 }'
.github/workflows/main.yml)
GOFUMPT_VERSION=$(shell awk '/GOFUMPT_VERSION:/ { print $$2 }'
.github/workflows/main.yml)
GOLANGCI_LINT_VERSION=$(shell awk '/GOLANGCI_LINT_VERSION:/ { print $$2 }'
.github/workflows/main.yml)
+GOLINES_VERSION=$(shell awk '/GOLINES_VERSION:/ { print $$2 }'
.github/workflows/main.yml)
GOVERSIONINFO_VERSION=$(shell awk '/GOVERSIONINFO_VERSION:/ { print $$2 }'
.github/workflows/main.yml)
ifdef VERSION
GO_LDFLAGS+=-X main.version=${VERSION}
@@ -107,10 +110,12 @@
${GO} generate
.PHONY: lint
-lint: ensure-golangci-lint
+lint: ensure-actionlint ensure-findtypos ensure-golangci-lint
+ ./bin/actionlint
./bin/golangci-lint run
${GO} run ./internal/cmds/lint-whitespace
find . -name \*.txtar | xargs ${GO} run ./internal/cmds/lint-txtar
+ ./bin/findtypos chezmoi .
.PHONY: format
format: ensure-gofumpt ensure-golines
@@ -127,7 +132,21 @@
./bin/goversioninfo -platform-specific
.PHONY: ensure-tools
-ensure-tools: ensure-gofumpt ensure-golangci-lint ensure-goversioninfo
+ensure-tools: ensure-actionlint ensure-findtypos ensure-gofumpt
ensure-golangci-lint ensure-golines ensure-goversioninfo
+
+.PHONY: ensure-actionlint
+ensure-actionlint:
+ if [ ! -x bin/actionlint ] || ( ./bin/actionlint --version | grep -Fqv
"v${ACTIONLINT_VERSION}" ) ; then \
+ mkdir -p bin ; \
+ GOBIN=$(shell pwd)/bin ${GO} install
"github.com/rhysd/actionlint/cmd/actionlint@v${ACTIONLINT_VERSION}" ; \
+ fi
+
+.PHONY: ensure-findtypos
+ensure-findtypos:
+ if [ ! -x bin/findtypos ] ; then \
+ mkdir -p bin ; \
+ GOBIN=$(shell pwd)/bin ${GO} install
"github.com/twpayne/findtypos@v${FINDTYPOS_VERSION}" ; \
+ fi
.PHONY: ensure-gofumpt
ensure-gofumpt:
@@ -138,9 +157,9 @@
.PHONY: ensure-golines
ensure-golines:
- if [ ! -x bin/golines ] ; then \
+ if [ ! -x bin/golines ] || ( ./bin/actionlint --version | grep -Fqv
"v${GOLINES_VERSION}" ) ; then \
mkdir -p bin ; \
- GOBIN=$(shell pwd)/bin ${GO} install
github.com/segmentio/golines@latest ; \
+ GOBIN=$(shell pwd)/bin ${GO} install
"github.com/segmentio/golines@v${GOLINES_VERSION}" ; \
fi
.PHONY: ensure-golangci-lint
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.34.2/assets/chezmoi.io/docs/install.md.tmpl
new/chezmoi-2.34.3/assets/chezmoi.io/docs/install.md.tmpl
--- old/chezmoi-2.34.2/assets/chezmoi.io/docs/install.md.tmpl 2023-06-17
02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/assets/chezmoi.io/docs/install.md.tmpl 2023-07-03
09:12:43.000000000 +0200
@@ -247,14 +247,6 @@
[`{{ $arch }}`](https://github.com/twpayne/chezmoi/releases/download/v{{
$version }}/chezmoi_{{ $version }}_openbsd_{{ $arch }}.tar.gz)
{{- end }}
-=== "Illumos"
-
- [`amd64`](https://github.com/twpayne/chezmoi/releases/download/v{{
$version }}/chezmoi_{{ $version }}_illumos_amd64.tar.gz)
-
-=== "Solaris"
-
- [`amd64`](https://github.com/twpayne/chezmoi/releases/download/v{{
$version }}/chezmoi_{{ $version }}_solaris_amd64.tar.gz)
-
## Install from source
Download, build, and install chezmoi for your system with Go 1.19 or later:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.34.2/assets/chezmoi.io/docs/links/links.yaml
new/chezmoi-2.34.3/assets/chezmoi.io/docs/links/links.yaml
--- old/chezmoi-2.34.2/assets/chezmoi.io/docs/links/links.yaml 2023-06-17
02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/assets/chezmoi.io/docs/links/links.yaml 2023-07-03
09:12:43.000000000 +0200
@@ -444,3 +444,8 @@
title: '491 - Tres herramientas que han revolucionado mi terminal Linux'
lang: ES
url:
https://atareao.es/podcast/tres-herramientas-que-han-revolucionado-mi-terminal-linux/
+- date: '2023-06-14'
+ version: 2.34.1
+ title: chezmoi
+ lang: RU
+ url: https://principal-engineering.ru/posts/chezmoi/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/assets/scripts/install-local-bin.sh
new/chezmoi-2.34.3/assets/scripts/install-local-bin.sh
--- old/chezmoi-2.34.2/assets/scripts/install-local-bin.sh 2023-06-17
02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/assets/scripts/install-local-bin.sh 2023-07-03
09:12:43.000000000 +0200
@@ -120,14 +120,6 @@
cygwin_nt*) goos="windows" ;;
mingw*) goos="windows" ;;
msys_nt*) goos="windows" ;;
- sunos*)
- kernel="$(uname -o | tr '[:upper:]' '[:lower:]')"
- case "${kernel}" in
- illumos*) goos="illumos" ;;
- solaris*) goos="solaris" ;;
- *) goos="${os}" ;;
- esac
- ;;
*) goos="${os}" ;;
esac
printf '%s' "${goos}"
@@ -157,7 +149,6 @@
freebsd/arm) return 0 ;;
freebsd/arm64) return 0 ;;
freebsd/riscv64) return 0 ;;
- illumos/amd64) return 0 ;;
linux/386) return 0 ;;
linux/amd64) return 0 ;;
linux/arm) return 0 ;;
@@ -174,7 +165,6 @@
openbsd/arm) return 0 ;;
openbsd/arm64) return 0 ;;
openbsd/mips64) return 0 ;;
- solaris/amd64) return 0 ;;
windows/386) return 0 ;;
windows/amd64) return 0 ;;
windows/arm) return 0 ;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/assets/scripts/install.sh
new/chezmoi-2.34.3/assets/scripts/install.sh
--- old/chezmoi-2.34.2/assets/scripts/install.sh 2023-06-17
02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/assets/scripts/install.sh 2023-07-03
09:12:43.000000000 +0200
@@ -120,14 +120,6 @@
cygwin_nt*) goos="windows" ;;
mingw*) goos="windows" ;;
msys_nt*) goos="windows" ;;
- sunos*)
- kernel="$(uname -o | tr '[:upper:]' '[:lower:]')"
- case "${kernel}" in
- illumos*) goos="illumos" ;;
- solaris*) goos="solaris" ;;
- *) goos="${os}" ;;
- esac
- ;;
*) goos="${os}" ;;
esac
printf '%s' "${goos}"
@@ -157,7 +149,6 @@
freebsd/arm) return 0 ;;
freebsd/arm64) return 0 ;;
freebsd/riscv64) return 0 ;;
- illumos/amd64) return 0 ;;
linux/386) return 0 ;;
linux/amd64) return 0 ;;
linux/arm) return 0 ;;
@@ -174,7 +165,6 @@
openbsd/arm) return 0 ;;
openbsd/arm64) return 0 ;;
openbsd/mips64) return 0 ;;
- solaris/amd64) return 0 ;;
windows/386) return 0 ;;
windows/amd64) return 0 ;;
windows/arm) return 0 ;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/go.mod new/chezmoi-2.34.3/go.mod
--- old/chezmoi-2.34.2/go.mod 2023-06-17 02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/go.mod 2023-07-03 09:12:43.000000000 +0200
@@ -12,22 +12,22 @@
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.19.10
github.com/bmatcuk/doublestar/v4 v4.6.0
github.com/bradenhilton/mozillainstallhash v1.0.1
- github.com/charmbracelet/bubbles v0.15.0
- github.com/charmbracelet/bubbletea v0.23.2
+ github.com/charmbracelet/bubbles v0.16.1
+ github.com/charmbracelet/bubbletea v0.24.2
github.com/charmbracelet/glamour v0.6.0
github.com/coreos/go-semver v0.3.1
github.com/fsnotify/fsnotify v1.6.0
github.com/go-git/go-git/v5 v5.7.0
- github.com/google/go-github/v53 v53.1.0
+ github.com/google/go-github/v53 v53.2.0
github.com/google/renameio/v2 v2.0.0
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
github.com/itchyny/gojq v0.12.13
github.com/klauspost/compress v1.16.6
github.com/mitchellh/mapstructure v1.5.0
github.com/muesli/combinator v0.3.0
- github.com/muesli/termenv v0.15.1
+ github.com/muesli/termenv v0.15.2
github.com/pelletier/go-toml/v2 v2.0.8
- github.com/rogpeppe/go-internal v1.10.0
+ github.com/rogpeppe/go-internal v1.11.0
github.com/rs/zerolog v1.29.1
github.com/sergi/go-diff v1.1.0
github.com/spf13/cobra v1.7.0
@@ -42,7 +42,7 @@
go.etcd.io/bbolt v1.3.7
go.uber.org/multierr v1.11.0
golang.org/x/crypto v0.10.0
- golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
+ golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df
golang.org/x/oauth2 v0.9.0
golang.org/x/sync v0.3.0
golang.org/x/sys v0.9.0
@@ -50,14 +50,14 @@
gopkg.in/ini.v1 v1.67.0
gopkg.in/yaml.v3 v3.0.1
howett.net/plist v1.0.0
- mvdan.cc/sh/v3 v3.6.0
+ mvdan.cc/sh/v3 v3.7.0
)
require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
- github.com/ProtonMail/go-crypto v0.0.0-20230528122434-6f98819771a1 //
indirect
+ github.com/ProtonMail/go-crypto v0.0.0-20230626094100-7e9e0395ebec //
indirect
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/alecthomas/chroma v0.10.0 // indirect
github.com/alecthomas/repr v0.2.0 // indirect
@@ -79,7 +79,7 @@
github.com/charmbracelet/harmonica v0.2.0 // indirect
github.com/charmbracelet/lipgloss v0.7.1 // indirect
github.com/cloudflare/circl v1.3.3 // indirect
- github.com/containerd/console v1.0.3 // indirect
+ github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 //
indirect
github.com/danieljoos/wincred v1.2.0 // indirect
github.com/dlclark/regexp2 v1.10.0 // indirect
github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad // indirect
@@ -127,16 +127,11 @@
golang.org/x/text v0.10.0 // indirect
golang.org/x/tools v0.10.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/protobuf v1.30.0 // indirect
+ google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
)
exclude (
- github.com/charmbracelet/bubbles v0.16.0 //
https://github.com/charmbracelet/bubbletea/issues/737
- github.com/charmbracelet/bubbles v0.16.1 //
https://github.com/charmbracelet/bubbletea/issues/737
- github.com/charmbracelet/bubbletea v0.24.0 //
https://github.com/charmbracelet/bubbletea/issues/737
- github.com/charmbracelet/bubbletea v0.24.1 //
https://github.com/charmbracelet/bubbletea/issues/737
- github.com/charmbracelet/bubbletea v0.24.2 //
https://github.com/charmbracelet/bubbletea/issues/737
github.com/sergi/go-diff v1.2.0 //
https://github.com/sergi/go-diff/issues/123
github.com/sergi/go-diff v1.3.0
github.com/sergi/go-diff v1.3.1 //
https://github.com/twpayne/chezmoi/issues/2706
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/go.sum new/chezmoi-2.34.3/go.sum
--- old/chezmoi-2.34.2/go.sum 2023-06-17 02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/go.sum 2023-07-03 09:12:43.000000000 +0200
@@ -1,9 +1,5 @@
-cloud.google.com/go/compute/metadata v0.2.0
h1:nBbNSZyDpkNlo3DepaaLKVuO7ClyifSAmNloSCZrHnQ=
-cloud.google.com/go/compute/metadata v0.2.0/go.mod
h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
filippo.io/age v1.1.1 h1:pIpO7l151hCnQ4BdyBujnGP2YlUo0uj6sAVNHGBvXHg=
filippo.io/age v1.1.1/go.mod h1:l03SrzDUrBkdBx8+IILdnn2KZysqQdbEBUQ4p3sqEQE=
-filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
-filippo.io/edwards25519 v1.0.0/go.mod
h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
github.com/Masterminds/goutils v1.1.1
h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
github.com/Masterminds/goutils v1.1.1/go.mod
h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
github.com/Masterminds/semver/v3 v3.2.0/go.mod
h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
@@ -14,8 +10,8 @@
github.com/Microsoft/go-winio v0.5.2/go.mod
h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
github.com/Microsoft/go-winio v0.6.1
h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
github.com/Microsoft/go-winio v0.6.1/go.mod
h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
-github.com/ProtonMail/go-crypto v0.0.0-20230528122434-6f98819771a1
h1:JMDGhoQvXNTqH6Y3MC0IUw6tcZvaUdujNqzK2HYWZc8=
-github.com/ProtonMail/go-crypto v0.0.0-20230528122434-6f98819771a1/go.mod
h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
+github.com/ProtonMail/go-crypto v0.0.0-20230626094100-7e9e0395ebec
h1:vV3RryLxt42+ZIVOFbYJCH1jsZNTNmj2NYru5zfx+4E=
+github.com/ProtonMail/go-crypto v0.0.0-20230626094100-7e9e0395ebec/go.mod
h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
github.com/Shopify/ejson v1.4.0 h1:RvvWSOjDdInbMNtR97eJ5GEd6njjDNSbvbFHoQjJAXo=
github.com/Shopify/ejson v1.4.0/go.mod
h1:VZMUtDzvBW/PAXRUF5fzp1ffb1ucT8MztrZXXLYZurw=
github.com/acomagu/bufpipe v1.0.4
h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ=
@@ -29,9 +25,7 @@
github.com/alessio/shellescape v1.4.1
h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVKJUX0=
github.com/alessio/shellescape v1.4.1/go.mod
h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be
h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
-github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod
h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
-github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod
h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/atotto/clipboard v0.1.4
h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
github.com/atotto/clipboard v0.1.4/go.mod
h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
github.com/aws/aws-sdk-go-v2 v1.18.1
h1:+tefE750oAb7ZQGzla6bLkOwfcQCEtC5y2RqoqCeqKo=
@@ -61,8 +55,6 @@
github.com/aws/smithy-go v1.13.5
h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8=
github.com/aws/smithy-go v1.13.5/go.mod
h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
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=
@@ -73,33 +65,26 @@
github.com/bradenhilton/cityhash v1.0.0/go.mod
h1:Wmb8yW1egA9ulrsRX4mxfYx5zq4nBWOCZ+j63oK6uz8=
github.com/bradenhilton/mozillainstallhash v1.0.1
h1:JVAVsItiWlLoudJX4L+tIuml+hoxjlzCwkhlENi9yS4=
github.com/bradenhilton/mozillainstallhash v1.0.1/go.mod
h1:J6cA36kUZrgaTkDl2bHRqI+4i2UKO1ImDB1P1x1PyOA=
-github.com/bwesterb/go-ristretto v1.2.3
h1:1w53tCkGhCQ5djbat3+MH0BAQ5Kfgbt56UZQ/JMzngw=
github.com/bwesterb/go-ristretto v1.2.3/go.mod
h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
-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.23.1/go.mod
h1:JAfGK/3/pPKHTnAS8JIE2u9f61BjWTQY57RbT25aMXU=
-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/bubbles v0.16.1
h1:6uzpAAaT9ZqKssntbvZMlksWHruQLNxg49H5WdeuYSY=
+github.com/charmbracelet/bubbles v0.16.1/go.mod
h1:2QCp9LFlEsBQMvIYERr7Ww2H2bA7xen1idUDIzm/+Xc=
+github.com/charmbracelet/bubbletea v0.24.2
h1:uaQIKx9Ai6Gdh5zpTbGiWpytMU+CfsPp06RaW2cx/SY=
+github.com/charmbracelet/bubbletea v0.24.2/go.mod
h1:XdrNrV4J8GiyshTtx3DNuYkR1FDaJmO3l2nejekbsgg=
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
h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
github.com/charmbracelet/harmonica v0.2.0/go.mod
h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
-github.com/charmbracelet/lipgloss v0.6.0/go.mod
h1:tHh2wr34xcHjC2HCXIlGSG1jaDF0S0atAUvBMP6Ppuk=
github.com/charmbracelet/lipgloss v0.7.1
h1:17WMwi7N1b1rVWOjMT+rCh7sQkvDU75B2hbZpc5Kc1E=
github.com/charmbracelet/lipgloss v0.7.1/go.mod
h1:yG0k3giv8Qj8edTCbbg6AlQ5e8KNWpFujkNawKNhE2c=
github.com/cloudflare/circl v1.3.3
h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs=
github.com/cloudflare/circl v1.3.3/go.mod
h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
-github.com/containerd/console v1.0.3
h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
-github.com/containerd/console v1.0.3/go.mod
h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
+github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81
h1:q2hJAaP1k2wIvVRd/hEHD7lacgqrCPS+k8g1MndzfWY=
+github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81/go.mod
h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
github.com/coreos/go-semver v0.3.1
h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
github.com/coreos/go-semver v0.3.1/go.mod
h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
-github.com/coreos/go-systemd/v22 v22.5.0
h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod
h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/go-md2man/v2 v2.0.2
h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod
h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creack/pty v1.1.9/go.mod
h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
-github.com/creack/pty v1.1.18/go.mod
h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
github.com/danieljoos/wincred v1.2.0
h1:ozqKHaLK0W/ii4KVbbvluM91W2H3Sh0BncbUNPS7jLE=
github.com/danieljoos/wincred v1.2.0/go.mod
h1:FzQLLMKBFdvu+osBrnFODiv32YGwCfx0SkRa/eYHgec=
github.com/davecgh/go-spew v1.1.0/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -111,21 +96,17 @@
github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad
h1:Qk76DOWdOp+GlyDKBAG3Klr9cn7N+LcYc82AZ2S7+cA=
github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad/go.mod
h1:mPKfmRa823oBIgl2r20LeMSpTAteW5j7FLkc0vjmzyQ=
github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819
h1:RIB4cRk+lBqKK3Oy0r2gRX4ui7tuhiZq2SuTtTCi0/0=
-github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819/go.mod
h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
github.com/emirpasic/gods v1.18.1
h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
github.com/emirpasic/gods v1.18.1/go.mod
h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
-github.com/frankban/quicktest v1.14.4
h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
-github.com/frankban/quicktest v1.14.4/go.mod
h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/frankban/quicktest v1.14.5
h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
github.com/fsnotify/fsnotify v1.6.0
h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
github.com/fsnotify/fsnotify v1.6.0/go.mod
h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
github.com/gliderlabs/ssh v0.3.5
h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
-github.com/gliderlabs/ssh v0.3.5/go.mod
h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376
h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod
h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
github.com/go-git/go-billy/v5 v5.4.1
h1:Uwp5tDRkPr+l/TnbHOQzp+tmJfLceOlbVucgpTz8ix4=
github.com/go-git/go-billy/v5 v5.4.1/go.mod
h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg=
github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20230305113008-0c11038e723f
h1:Pz0DHeFij3XFhoBRGUDPzSJ+w2UcK5/0JvF8DRI58r8=
-github.com/go-git/go-git-fixtures/v4
v4.3.2-0.20230305113008-0c11038e723f/go.mod
h1:8LHG1a3SRW71ettAD/jW13h8c6AqjVSeL11RAdgaqpo=
github.com/go-git/go-git/v5 v5.7.0
h1:t9AudWVLmqzlo+4bqdf7GY+46SUuRsx59SboFxkq2aE=
github.com/go-git/go-git/v5 v5.7.0/go.mod
h1:coJHKEOk5kUClpsNlXrUvPrDxY3w3gjHvhcZd8Fodw8=
github.com/godbus/dbus/v5 v5.0.4/go.mod
h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -134,7 +115,6 @@
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod
h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
-github.com/golang/mock v1.6.0/go.mod
h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
github.com/golang/protobuf v1.3.1/go.mod
h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.5.0/go.mod
h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.3
h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
@@ -145,9 +125,8 @@
github.com/google/go-cmp v0.5.5/go.mod
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.8/go.mod
h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod
h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-github/v53 v53.1.0
h1:mKJnR9lzZwD1fvbp27aK1i6rxyAbycWsXlN+r9JKPqM=
-github.com/google/go-github/v53 v53.1.0/go.mod
h1:XhFRObz+m/l+UCm9b7KSIC3lT3NWSXGt7mOsAWEloao=
+github.com/google/go-github/v53 v53.2.0
h1:wvz3FyF53v4BK+AsnvCmeNhf8AkTaeh2SoYu/XUvTtI=
+github.com/google/go-github/v53 v53.2.0/go.mod
h1:XhFRObz+m/l+UCm9b7KSIC3lT3NWSXGt7mOsAWEloao=
github.com/google/go-querystring v1.1.0
h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod
h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
github.com/google/renameio/v2 v2.0.0
h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg=
@@ -156,7 +135,6 @@
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00
h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0=
-github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod
h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
github.com/gorilla/css v1.0.0/go.mod
h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
@@ -178,14 +156,9 @@
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99
h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod
h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/jessevdk/go-flags v1.4.0/go.mod
h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jessevdk/go-flags v1.5.0
h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
-github.com/jessevdk/go-flags v1.5.0/go.mod
h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
-github.com/jmespath/go-jmespath v0.4.0
h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
github.com/jmespath/go-jmespath v0.4.0/go.mod
h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1
h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod
h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
github.com/jtolds/gls v4.20.0+incompatible
h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod
h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/kevinburke/ssh_config v1.2.0
h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
github.com/kevinburke/ssh_config v1.2.0/go.mod
h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/klauspost/compress v1.16.6
h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk=
@@ -193,14 +166,10 @@
github.com/kr/pretty v0.1.0/go.mod
h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.1/go.mod
h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod
h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod
h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod
h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kylelemons/godebug v1.1.0
h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
-github.com/kylelemons/godebug v1.1.0/go.mod
h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/lucasb-eyer/go-colorful v1.2.0
h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod
h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A=
@@ -210,15 +179,12 @@
github.com/mattn/go-colorable v0.1.13/go.mod
h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
github.com/mattn/go-isatty v0.0.14/go.mod
h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
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.19
h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
github.com/mattn/go-isatty v0.0.19/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.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=
-github.com/mattn/go-runewidth v0.0.13/go.mod
h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/mattn/go-runewidth v0.0.14
h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
github.com/mattn/go-runewidth v0.0.14/go.mod
h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/microcosm-cc/bluemonday v1.0.21/go.mod
h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM=
@@ -232,24 +198,17 @@
github.com/mitchellh/reflectwalk v1.0.0/go.mod
h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/mitchellh/reflectwalk v1.0.2
h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
github.com/mitchellh/reflectwalk v1.0.2/go.mod
h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/mmcloughlin/avo v0.5.0
h1:nAco9/aI9Lg2kiuROBY6BhCI/z0t5jEvJfjWbL8qXLU=
-github.com/mmcloughlin/avo v0.5.0/go.mod
h1:ChHFdoV7ql95Wi7vuq2YT1bwCJqiWdZrQ1im3VujLYM=
-github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod
h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho=
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6
h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod
h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
github.com/muesli/cancelreader v0.2.2
h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
github.com/muesli/cancelreader v0.2.2/go.mod
h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
github.com/muesli/combinator v0.3.0
h1:SZDuRzzwmVPLkbOzbhGzBTwd5+Y6aFN4UusOW2azrNA=
github.com/muesli/combinator v0.3.0/go.mod
h1:ttPegJX0DPQaGDtJKMInIP6Vfp5pN8RX7QntFCcpy18=
-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=
-github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0/go.mod
h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs=
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/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/muesli/termenv v0.15.2
h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
+github.com/muesli/termenv v0.15.2/go.mod
h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod
h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/olekukonko/tablewriter v0.0.5
h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
github.com/olekukonko/tablewriter v0.0.5/go.mod
h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
@@ -259,8 +218,6 @@
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod
h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
github.com/pjbgf/sha1cd v0.3.0/go.mod
h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e
h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod
h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod
h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0
h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -269,32 +226,22 @@
github.com/rivo/uniseg v0.2.0/go.mod
h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
github.com/rivo/uniseg v0.4.4/go.mod
h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/rogpeppe/go-internal v1.10.0
h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.10.0/go.mod
h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
-github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY=
+github.com/rogpeppe/go-internal v1.11.0
h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
+github.com/rogpeppe/go-internal v1.11.0/go.mod
h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc=
github.com/rs/zerolog v1.29.1/go.mod
h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU=
-github.com/russross/blackfriday/v2 v2.1.0
h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod
h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI=
-github.com/sahilm/fuzzy v0.1.0/go.mod
h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod
h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
github.com/shopspring/decimal v1.2.0/go.mod
h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/shopspring/decimal v1.3.1
h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
github.com/shopspring/decimal v1.3.1/go.mod
h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/shurcooL/sanitized_anchor_name v1.0.0
h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod
h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/sirupsen/logrus v1.7.0/go.mod
h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.9.0
h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod
h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/skeema/knownhosts v1.1.1
h1:MTk78x9FPgDFVFkDLTrsnnfCJl7g1C/nnKvePgrIngE=
github.com/skeema/knownhosts v1.1.1/go.mod
h1:g4fPeYpque7P0xefxtGzV81ihjC8sX2IqpAoNkjxbMo=
github.com/smartystreets/assertions v1.0.1
h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w=
-github.com/smartystreets/assertions v1.0.1/go.mod
h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
github.com/smartystreets/goconvey v1.6.4
h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
-github.com/smartystreets/goconvey v1.6.4/go.mod
h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/spf13/cast v1.3.1/go.mod
h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
github.com/spf13/cast v1.5.1/go.mod
h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
@@ -324,8 +271,6 @@
github.com/twpayne/go-xdg/v6 v6.1.1/go.mod
h1:+0KSJ4Dx+xaZeDXWZITF84BcNc1UiHDm0DP8txprfD8=
github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
github.com/ulikunitz/xz v0.5.11/go.mod
h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA=
-github.com/urfave/cli v1.22.4/go.mod
h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1
h1:+dBg5k7nuTE38VVdoroRsT0Z88fmvdYrI2EjzJst35I=
github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1/go.mod
h1:nmuySobZb4kFgFy6BptpXp/BBw+xFSyvVPP6auoJB4k=
github.com/xanzy/ssh-agent v0.3.3
h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
@@ -341,10 +286,6 @@
github.com/zalando/go-keyring v0.2.3/go.mod
h1:HL4k+OXQfJUWaMnqyuSOc0drfGPX2b51Du6K+MRgZMk=
go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
-go.etcd.io/gofail v0.1.0 h1:XItAMIhOojXFQMgrxjnd2EIIHun/d5qL0Pf7FzVTkFg=
-go.etcd.io/gofail v0.1.0/go.mod h1:VZBCXYGZhHAinaBiiqYvuDynvahNsAyLFwB3kEHKz1M=
-go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
-go.uber.org/atomic v1.7.0/go.mod
h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod
h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod
h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -355,8 +296,8 @@
golang.org/x/crypto v0.7.0/go.mod
h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
golang.org/x/crypto v0.10.0/go.mod
h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
-golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
-golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod
h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
+golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df
h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME=
+golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod
h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
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/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
@@ -387,13 +328,13 @@
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
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/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -424,14 +365,13 @@
golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg=
golang.org/x/tools v0.10.0/go.mod
h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/appengine v1.6.7
h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
google.golang.org/appengine v1.6.7/go.mod
h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/protobuf v1.26.0-rc.1/go.mod
h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod
h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.30.0
h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod
h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.31.0
h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod
h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod
h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod
h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -440,12 +380,10 @@
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
gopkg.in/warnings.v0 v0.1.2/go.mod
h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
-gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0
h1:POO/ycCATvegFmVuPpQzZFJ+pGZeX22Ufu6fibxDVjU=
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod
h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod
h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod
h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -453,7 +391,5 @@
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
-mvdan.cc/editorconfig v0.2.0 h1:XL+7ys6ls/RKrkUNFQvEwIvNHh+JKx8Mj1pUV5wQxQE=
-mvdan.cc/editorconfig v0.2.0/go.mod
h1:lvnnD3BNdBYkhq+B4uBuFFKatfp02eB6HixDvEz91C0=
-mvdan.cc/sh/v3 v3.6.0 h1:gtva4EXJ0dFNvl5bHjcUEvws+KRcDslT8VKheTYkbGU=
-mvdan.cc/sh/v3 v3.6.0/go.mod h1:U4mhtBLZ32iWhif5/lD+ygy1zrgaQhUu+XFy7C8+TTA=
+mvdan.cc/sh/v3 v3.7.0 h1:lSTjdP/1xsddtaKfGg7Myu7DnlHItd3/M2tomOcNNBg=
+mvdan.cc/sh/v3 v3.7.0/go.mod h1:K2gwkaesF/D7av7Kxl0HbF5kGOd2ArupNTX3X44+8l8=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.34.2/internal/cmds/generate-install.sh/install.sh.tmpl
new/chezmoi-2.34.3/internal/cmds/generate-install.sh/install.sh.tmpl
--- old/chezmoi-2.34.2/internal/cmds/generate-install.sh/install.sh.tmpl
2023-06-17 02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/internal/cmds/generate-install.sh/install.sh.tmpl
2023-07-03 09:12:43.000000000 +0200
@@ -120,14 +120,6 @@
cygwin_nt*) goos="windows" ;;
mingw*) goos="windows" ;;
msys_nt*) goos="windows" ;;
- sunos*)
- kernel="$(uname -o | tr '[:upper:]' '[:lower:]')"
- case "${kernel}" in
- illumos*) goos="illumos" ;;
- solaris*) goos="solaris" ;;
- *) goos="${os}" ;;
- esac
- ;;
*) goos="${os}" ;;
esac
printf '%s' "${goos}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/pkg/chezmoi/chezmoi.go
new/chezmoi-2.34.3/pkg/chezmoi/chezmoi.go
--- old/chezmoi-2.34.2/pkg/chezmoi/chezmoi.go 2023-06-17 02:27:17.000000000
+0200
+++ new/chezmoi-2.34.3/pkg/chezmoi/chezmoi.go 2023-07-03 09:12:43.000000000
+0200
@@ -11,6 +11,7 @@
"fmt"
"io"
"io/fs"
+ "net"
"os"
"path/filepath"
"regexp"
@@ -296,7 +297,8 @@
text = strings.TrimSpace(text)
text, _, _ = strings.Cut(text, "#")
fields := whitespaceRx.Split(text, -1)
- if len(fields) >= 2 && fields[0] == "127.0.1.1" {
+ if len(fields) > 1 && net.ParseIP(fields[0]).IsLoopback() &&
+ strings.Contains(fields[1], ".") {
return fields[1], nil
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/pkg/chezmoi/chezmoi_test.go
new/chezmoi-2.34.3/pkg/chezmoi/chezmoi_test.go
--- old/chezmoi-2.34.2/pkg/chezmoi/chezmoi_test.go 2023-06-17
02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/pkg/chezmoi/chezmoi_test.go 2023-07-03
09:12:43.000000000 +0200
@@ -53,6 +53,31 @@
expected: "host.example.com",
},
{
+ name: "etc_hosts_loopback_ipv4",
+ root: map[string]any{
+ "/etc/hosts": chezmoitest.JoinLines(
+ `invalid localhost`,
+ `127.0.0.1 localhost`,
+ `::1 localhost`,
+ `127.0.0.2 host.example.com host`,
+ ),
+ },
+ f: etcHostsFQDNHostname,
+ expected: "host.example.com",
+ },
+ {
+ name: "etc_hosts_loopback_ipv6",
+ root: map[string]any{
+ "/etc/hosts": chezmoitest.JoinLines(
+ `127.0.0.1 localhost`,
+ `::1 localhost`,
+ `::1 host.example.com host`,
+ ),
+ },
+ f: etcHostsFQDNHostname,
+ expected: "host.example.com",
+ },
+ {
name: "etc_hosts_whitespace_and_comments",
root: map[string]any{
"/etc/hosts": chezmoitest.JoinLines(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/pkg/chezmoi/sourcestate.go
new/chezmoi-2.34.3/pkg/chezmoi/sourcestate.go
--- old/chezmoi-2.34.2/pkg/chezmoi/sourcestate.go 2023-06-17
02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/pkg/chezmoi/sourcestate.go 2023-07-03
09:12:43.000000000 +0200
@@ -32,6 +32,7 @@
vfs "github.com/twpayne/go-vfs/v4"
"go.uber.org/multierr"
"golang.org/x/exp/maps"
+ "golang.org/x/exp/slices"
"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
)
@@ -316,7 +317,31 @@
destAbsPathInfos map[AbsPath]fs.FileInfo,
options *AddOptions,
) error {
- for destAbsPath := range destAbsPathInfos {
+ // Filter out excluded and ignored paths.
+ destAbsPaths := AbsPaths(maps.Keys(destAbsPathInfos))
+ sort.Sort(destAbsPaths)
+ n := 0
+ for _, destAbsPath := range destAbsPaths {
+ destAbsPathInfo := destAbsPathInfos[destAbsPath]
+ if !options.Filter.IncludeFileInfo(destAbsPathInfo) {
+ continue
+ }
+
+ targetRelPath := destAbsPath.MustTrimDirPrefix(s.destDirAbsPath)
+ if s.Ignore(targetRelPath) {
+ if options.OnIgnoreFunc != nil {
+ options.OnIgnoreFunc(targetRelPath)
+ }
+ continue
+ }
+
+ destAbsPaths[n] = destAbsPath
+ n++
+ }
+ destAbsPaths = destAbsPaths[:n]
+
+ // Check for protected paths.
+ for _, destAbsPath := range destAbsPaths {
for _, protectedAbsPath := range options.ProtectedAbsPaths {
if protectedAbsPath.Empty() {
continue
@@ -337,29 +362,15 @@
sourceRelPaths []SourceRelPath
}
- destAbsPaths := AbsPaths(maps.Keys(destAbsPathInfos))
- sort.Sort(destAbsPaths)
-
- sourceUpdates := make([]sourceUpdate, 0, len(destAbsPathInfos))
+ sourceUpdates := make([]sourceUpdate, 0, len(destAbsPaths))
newSourceStateEntries := make(map[SourceRelPath]SourceStateEntry)
newSourceStateEntriesByTargetRelPath :=
make(map[RelPath]SourceStateEntry)
nonEmptyDirs := make(map[SourceRelPath]struct{})
dirRenames := make(map[AbsPath]AbsPath)
DEST_ABS_PATH:
for _, destAbsPath := range destAbsPaths {
- destAbsPathInfo := destAbsPathInfos[destAbsPath]
- if !options.Filter.IncludeFileInfo(destAbsPathInfo) {
- continue
- }
targetRelPath := destAbsPath.MustTrimDirPrefix(s.destDirAbsPath)
- if s.Ignore(targetRelPath) {
- if options.OnIgnoreFunc != nil {
- options.OnIgnoreFunc(targetRelPath)
- }
- continue
- }
-
// Find the target's parent directory in the source state.
var parentSourceRelPath SourceRelPath
if targetParentRelPath := targetRelPath.Dir();
targetParentRelPath == DotRelPath {
@@ -373,6 +384,7 @@
}
nonEmptyDirs[parentSourceRelPath] = struct{}{}
+ destAbsPathInfo := destAbsPathInfos[destAbsPath]
actualStateEntry, err := NewActualStateEntry(destSystem,
destAbsPath, destAbsPathInfo, nil)
if err != nil {
return err
@@ -1434,7 +1446,7 @@
name := templateRelPath.String()
tmpl, err := ParseTemplate(name, contents,
s.templateFuncs, TemplateOptions{
- Options: append([]string(nil),
s.templateOptions...),
+ Options: slices.Clone(s.templateOptions),
})
if err != nil {
return err
@@ -1792,7 +1804,7 @@
templateContents,
s.templateFuncs,
TemplateOptions{
- Options: append([]string(nil),
s.templateOptions...),
+ Options:
slices.Clone(s.templateOptions),
},
)
if err != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/pkg/chezmoilog/chezmoilog.go
new/chezmoi-2.34.3/pkg/chezmoilog/chezmoilog.go
--- old/chezmoi-2.34.2/pkg/chezmoilog/chezmoilog.go 2023-06-17
02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/pkg/chezmoilog/chezmoilog.go 2023-07-03
09:12:43.000000000 +0200
@@ -10,6 +10,7 @@
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
+ "golang.org/x/exp/slices"
)
const few = 64
@@ -93,7 +94,7 @@
// FirstFewBytes returns the first few bytes of data in a human-readable form.
func FirstFewBytes(data []byte) []byte {
if len(data) > few {
- data = append([]byte{}, data[:few]...)
+ data = slices.Clone(data[:few])
data = append(data, '.', '.', '.')
}
return data
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/pkg/cmd/config.go
new/chezmoi-2.34.3/pkg/cmd/config.go
--- old/chezmoi-2.34.2/pkg/cmd/config.go 2023-06-17 02:27:17.000000000
+0200
+++ new/chezmoi-2.34.3/pkg/cmd/config.go 2023-07-03 09:12:43.000000000
+0200
@@ -42,6 +42,7 @@
cobracompletefig
"github.com/withfig/autocomplete-tools/integrations/cobra"
"go.uber.org/multierr"
"golang.org/x/exp/maps"
+ "golang.org/x/exp/slices"
"golang.org/x/term"
"mvdan.cc/sh/v3/expand"
"mvdan.cc/sh/v3/syntax"
@@ -91,30 +92,31 @@
// ConfigFile contains all data settable in the config file.
type ConfigFile struct {
// Global configuration.
- CacheDirAbsPath chezmoi.AbsPath `json:"cacheDir"
mapstructure:"cacheDir" yaml:"cacheDir"`
- Color autoBool `json:"color"
mapstructure:"color" yaml:"color"`
- Data map[string]any `json:"data"
mapstructure:"data" yaml:"data"`
- Format writeDataFormat `json:"format"
mapstructure:"format" yaml:"format"`
- DestDirAbsPath chezmoi.AbsPath `json:"destDir"
mapstructure:"destDir" yaml:"destDir"`
- GitHub gitHubConfig `json:"gitHub"
mapstructure:"gitHub" yaml:"gitHub"`
- Hooks map[string]hookConfig `json:"hooks"
mapstructure:"hooks" yaml:"hooks"`
- Interpreters map[string]*chezmoi.Interpreter `json:"interpreters"
mapstructure:"interpreters" yaml:"interpreters"`
- Mode chezmoi.Mode `json:"mode"
mapstructure:"mode" yaml:"mode"`
- Pager string `json:"pager"
mapstructure:"pager" yaml:"pager"`
- PINEntry pinEntryConfig `json:"pinentry"
mapstructure:"pinentry" yaml:"pinentry"`
- Progress autoBool `json:"progress"
mapstructure:"progress" yaml:"progress"`
- Safe bool `json:"safe"
mapstructure:"safe" yaml:"safe"`
- ScriptEnv map[string]string `json:"scriptEnv"
mapstructure:"scriptEnv" yaml:"scriptEnv"`
- ScriptTempDir chezmoi.AbsPath
`json:"scriptTempDir" mapstructure:"scriptTempDir" yaml:"scriptTempDir"`
- SourceDirAbsPath chezmoi.AbsPath `json:"sourceDir"
mapstructure:"sourceDir" yaml:"sourceDir"`
- Template templateConfig `json:"template"
mapstructure:"template" yaml:"template"`
- TextConv textConv `json:"textConv"
mapstructure:"textConv" yaml:"textConv"`
- Umask fs.FileMode `json:"umask"
mapstructure:"umask" yaml:"umask"`
- UseBuiltinAge autoBool
`json:"useBuiltinAge" mapstructure:"useBuiltinAge" yaml:"useBuiltinAge"`
- UseBuiltinGit autoBool
`json:"useBuiltinGit" mapstructure:"useBuiltinGit" yaml:"useBuiltinGit"`
- Verbose bool `json:"verbose"
mapstructure:"verbose" yaml:"verbose"`
- Warnings warningsConfig `json:"warnings"
mapstructure:"warnings" yaml:"warnings"`
- WorkingTreeAbsPath chezmoi.AbsPath `json:"workingTree"
mapstructure:"workingTree" yaml:"workingTree"`
+ CacheDirAbsPath chezmoi.AbsPath `json:"cacheDir"
mapstructure:"cacheDir" yaml:"cacheDir"`
+ Color autoBool `json:"color"
mapstructure:"color" yaml:"color"`
+ Data map[string]any `json:"data"
mapstructure:"data" yaml:"data"`
+ Format writeDataFormat `json:"format"
mapstructure:"format" yaml:"format"`
+ DestDirAbsPath chezmoi.AbsPath `json:"destDir"
mapstructure:"destDir" yaml:"destDir"`
+ GitHub gitHubConfig `json:"gitHub"
mapstructure:"gitHub" yaml:"gitHub"`
+ Hooks map[string]hookConfig `json:"hooks"
mapstructure:"hooks" yaml:"hooks"`
+ Interpreters map[string]*chezmoi.Interpreter
`json:"interpreters" mapstructure:"interpreters" yaml:"interpreters"`
+ Mode chezmoi.Mode `json:"mode"
mapstructure:"mode" yaml:"mode"`
+ Pager string `json:"pager"
mapstructure:"pager" yaml:"pager"`
+ PersistentStateAbsPath chezmoi.AbsPath
`json:"persistentState" mapstructure:"persistentState" yaml:"persistentState"`
+ PINEntry pinEntryConfig `json:"pinentry"
mapstructure:"pinentry" yaml:"pinentry"`
+ Progress autoBool `json:"progress"
mapstructure:"progress" yaml:"progress"`
+ Safe bool `json:"safe"
mapstructure:"safe" yaml:"safe"`
+ ScriptEnv map[string]string
`json:"scriptEnv" mapstructure:"scriptEnv" yaml:"scriptEnv"`
+ ScriptTempDir chezmoi.AbsPath
`json:"scriptTempDir" mapstructure:"scriptTempDir" yaml:"scriptTempDir"`
+ SourceDirAbsPath chezmoi.AbsPath
`json:"sourceDir" mapstructure:"sourceDir" yaml:"sourceDir"`
+ Template templateConfig `json:"template"
mapstructure:"template" yaml:"template"`
+ TextConv textConv `json:"textConv"
mapstructure:"textConv" yaml:"textConv"`
+ Umask fs.FileMode `json:"umask"
mapstructure:"umask" yaml:"umask"`
+ UseBuiltinAge autoBool
`json:"useBuiltinAge" mapstructure:"useBuiltinAge" yaml:"useBuiltinAge"`
+ UseBuiltinGit autoBool
`json:"useBuiltinGit" mapstructure:"useBuiltinGit" yaml:"useBuiltinGit"`
+ Verbose bool `json:"verbose"
mapstructure:"verbose" yaml:"verbose"`
+ Warnings warningsConfig `json:"warnings"
mapstructure:"warnings" yaml:"warnings"`
+ WorkingTreeAbsPath chezmoi.AbsPath
`json:"workingTree" mapstructure:"workingTree" yaml:"workingTree"`
// Password manager configurations.
AWSSecretsManager awsSecretsManagerConfig `json:"awsSecretsManager"
mapstructure:"awsSecretsManager" yaml:"awsSecretsManager"`
@@ -201,17 +203,16 @@
versionStr string
// Configuration.
- fileSystem vfs.FS
- bds *xdg.BaseDirectorySpecification
- configFileAbsPath chezmoi.AbsPath
- configFileAbsPathErr error
- baseSystem chezmoi.System
- sourceSystem chezmoi.System
- destSystem chezmoi.System
- persistentStateAbsPath chezmoi.AbsPath
- persistentState chezmoi.PersistentState
- httpClient *http.Client
- logger *zerolog.Logger
+ fileSystem vfs.FS
+ bds *xdg.BaseDirectorySpecification
+ configFileAbsPath chezmoi.AbsPath
+ configFileAbsPathErr error
+ baseSystem chezmoi.System
+ sourceSystem chezmoi.System
+ destSystem chezmoi.System
+ persistentState chezmoi.PersistentState
+ httpClient *http.Client
+ logger *zerolog.Logger
// Computed configuration.
homeDirAbsPath chezmoi.AbsPath
@@ -766,7 +767,7 @@
chezmoi.RecursiveMerge(funcMap, initTemplateFuncs)
tmpl, err := chezmoi.ParseTemplate(filename.String(), data, funcMap,
chezmoi.TemplateOptions{
- Options: append([]string(nil), c.Template.Options...),
+ Options: slices.Clone(c.Template.Options),
})
if err != nil {
return nil, err
@@ -1389,7 +1390,7 @@
},
})
templateOptions := chezmoi.TemplateOptions{
- Options: append([]string(nil), c.Template.Options...),
+ Options: slices.Clone(c.Template.Options),
}
commitMessageTmpl, err := chezmoi.ParseTemplate(
"commit_message",
@@ -1460,7 +1461,7 @@
persistentFlags.Var(&c.Color, "color", "Colorize output")
persistentFlags.VarP(&c.DestDirAbsPath, "destination", "D", "Set
destination directory")
persistentFlags.Var(&c.Mode, "mode", "Mode")
- persistentFlags.Var(&c.persistentStateAbsPath, "persistent-state", "Set
persistent state file")
+ persistentFlags.Var(&c.PersistentStateAbsPath, "persistent-state", "Set
persistent state file")
persistentFlags.Var(&c.Progress, "progress", "Display progress bars")
persistentFlags.BoolVar(&c.Safe, "safe", c.Safe, "Safely replace files
and symlinks")
persistentFlags.VarP(&c.SourceDirAbsPath, "source", "S", "Set source
directory")
@@ -2060,8 +2061,8 @@
// returning the first persistent file found, and returning the default path if
// none are found.
func (c *Config) persistentStateFile() (chezmoi.AbsPath, error) {
- if !c.persistentStateAbsPath.Empty() {
- return c.persistentStateAbsPath, nil
+ if !c.PersistentStateAbsPath.Empty() {
+ return c.PersistentStateAbsPath, nil
}
if !c.configFileAbsPath.Empty() {
return
c.configFileAbsPath.Dir().Join(persistentStateFileRelPath), nil
@@ -2513,11 +2514,6 @@
// useBuiltinGitAutoFunc detects whether the builtin git should be used.
func (c *Config) useBuiltinGitAutoFunc() bool {
- // useBuiltinGit is false by default on Solaris as it uses the
unavailable
- // flock function.
- if runtime.GOOS == "solaris" {
- return false
- }
if _, err := chezmoi.LookPath(c.Git.Command); err == nil {
return false
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/pkg/cmd/dashlanetemplatefuncs.go
new/chezmoi-2.34.3/pkg/cmd/dashlanetemplatefuncs.go
--- old/chezmoi-2.34.2/pkg/cmd/dashlanetemplatefuncs.go 2023-06-17
02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/pkg/cmd/dashlanetemplatefuncs.go 2023-07-03
09:12:43.000000000 +0200
@@ -5,6 +5,8 @@
"os"
"os/exec"
+ "golang.org/x/exp/slices"
+
"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
)
@@ -60,7 +62,8 @@
func (c *Config) dashlaneOutput(args ...string) ([]byte, error) {
name := c.Dashlane.Command
- cmd := exec.Command(name, append(c.Dashlane.Args, args...)...)
+ args = append(slices.Clone(c.Dashlane.Args), args...)
+ cmd := exec.Command(name, args...)
cmd.Stderr = os.Stderr
output, err := chezmoilog.LogCmdOutput(cmd)
if err != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/pkg/cmd/passholetemplatefuncs.go
new/chezmoi-2.34.3/pkg/cmd/passholetemplatefuncs.go
--- old/chezmoi-2.34.2/pkg/cmd/passholetemplatefuncs.go 2023-06-17
02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/pkg/cmd/passholetemplatefuncs.go 2023-07-03
09:12:43.000000000 +0200
@@ -7,6 +7,7 @@
"os/exec"
"github.com/coreos/go-semver/semver"
+ "golang.org/x/exp/slices"
"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
)
@@ -35,7 +36,7 @@
return value
}
- args := append([]string{}, c.Passhole.Args...)
+ args := slices.Clone(c.Passhole.Args)
var stdin io.Reader
if c.Passhole.Prompt {
if c.Passhole.password == "" {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/pkg/cmd/secrettemplatefuncs.go
new/chezmoi-2.34.3/pkg/cmd/secrettemplatefuncs.go
--- old/chezmoi-2.34.2/pkg/cmd/secrettemplatefuncs.go 2023-06-17
02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/pkg/cmd/secrettemplatefuncs.go 2023-07-03
09:12:43.000000000 +0200
@@ -7,6 +7,8 @@
"os/exec"
"strings"
+ "golang.org/x/exp/slices"
+
"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
)
@@ -43,7 +45,7 @@
return output, nil
}
- args = append(c.Secret.Args, args...)
+ args = append(slices.Clone(c.Secret.Args), args...)
cmd := exec.Command(c.Secret.Command, args...) //nolint:gosec
cmd.Stdin = os.Stdin
cmd.Stderr = os.Stderr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.34.2/pkg/cmd/testdata/scripts/archivetar.txtar
new/chezmoi-2.34.3/pkg/cmd/testdata/scripts/archivetar.txtar
--- old/chezmoi-2.34.2/pkg/cmd/testdata/scripts/archivetar.txtar
2023-06-17 02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/pkg/cmd/testdata/scripts/archivetar.txtar
2023-07-03 09:12:43.000000000 +0200
@@ -4,14 +4,12 @@
exec chezmoi archive --output=archive.tar
exec tar -tf archive.tar
-[!(illumos||openbsd)] cmp stdout golden/archive-tar
-[illumos] cmp stdout golden/archive-tar-illumos
+[!openbsd] cmp stdout golden/archive-tar
[openbsd] cmp stdout golden/archive-tar-openbsd
exec chezmoi archive --gzip --output=archive.tar.gz
exec tar -tzf archive.tar.gz
-[!(illumos||openbsd)] cmp stdout golden/archive-tar
-[illumos] cmp stdout golden/archive-tar-illumos
+[!openbsd] cmp stdout golden/archive-tar
[openbsd] cmp stdout golden/archive-tar-openbsd
-- golden/archive-tar --
@@ -27,19 +25,6 @@
.readonly
.symlink
.template
--- golden/archive-tar-illumos --
-.create
-.dir/
-.dir/file
-.dir/subdir/
-.dir/subdir/file
-.empty
-.executable
-.file
-.private
-.readonly
-.symlink symbolic link to .dir/subdir/file
-.template
-- golden/archive-tar-openbsd --
.create
.dir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.34.2/pkg/cmd/testdata/scripts/builtingit.txtar
new/chezmoi-2.34.3/pkg/cmd/testdata/scripts/builtingit.txtar
--- old/chezmoi-2.34.2/pkg/cmd/testdata/scripts/builtingit.txtar
2023-06-17 02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/pkg/cmd/testdata/scripts/builtingit.txtar
2023-07-03 09:12:43.000000000 +0200
@@ -1,5 +1,4 @@
[!exec:git] skip 'git not found in $PATH'
-[solaris] skip 'go-git uses flock which is not available on solaris'
[windows] skip 'go-git does not support file:// URLs on windows'
chmod 755 golden/git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.34.2/pkg/cmd/testdata/scripts/issue3051.txtar
new/chezmoi-2.34.3/pkg/cmd/testdata/scripts/issue3051.txtar
--- old/chezmoi-2.34.2/pkg/cmd/testdata/scripts/issue3051.txtar 1970-01-01
01:00:00.000000000 +0100
+++ new/chezmoi-2.34.3/pkg/cmd/testdata/scripts/issue3051.txtar 2023-07-03
09:12:43.000000000 +0200
@@ -0,0 +1,9 @@
+# test that chezmoi add respects .chezmoiignore in the presence of protected
paths
+exec chezmoi add -r $HOME${/}.local
+exists $CHEZMOISOURCEDIR/dot_local/bin/hello.sh
+
+-- home/user/.local/bin/hello.sh --
+#!/bin/sh
+-- home/user/.local/share/chezmoi/.chezmoiignore --
+.local/share/chezmoi
+.local/share/chezmoi/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.34.2/pkg/cmd/testdata/scripts/issue3064.txtar
new/chezmoi-2.34.3/pkg/cmd/testdata/scripts/issue3064.txtar
--- old/chezmoi-2.34.2/pkg/cmd/testdata/scripts/issue3064.txtar 1970-01-01
01:00:00.000000000 +0100
+++ new/chezmoi-2.34.3/pkg/cmd/testdata/scripts/issue3064.txtar 2023-07-03
09:12:43.000000000 +0200
@@ -0,0 +1,10 @@
+[windows] skip 'UNIX only'
+
+# test that chezmoi respects the persistentState config variable
+exec chezmoi apply
+exists test.boltdb
+
+-- home/user/.config/chezmoi/chezmoi.yaml --
+persistentState: test.boltdb
+-- home/user/.local/share/chezmoi/run_once_script.sh --
+#!/bin/sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.34.2/pkg/cmd/testdata/scripts/templatefuncs.txtar
new/chezmoi-2.34.3/pkg/cmd/testdata/scripts/templatefuncs.txtar
--- old/chezmoi-2.34.2/pkg/cmd/testdata/scripts/templatefuncs.txtar
2023-06-17 02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/pkg/cmd/testdata/scripts/templatefuncs.txtar
2023-07-03 09:12:43.000000000 +0200
@@ -90,8 +90,7 @@
# test that the output function returns an error if the command fails
[!windows] ! exec chezmoi execute-template '{{ output "false" }}'
-[!(windows||illumos)] stderr 'error calling output: .*/false: exit status 1'
-[illumos] stderr 'error calling output: .*/false: exit status 255'
+[!windows] stderr 'error calling output: .*/false: exit status 1'
# test pruneEmptyDicts template function
exec chezmoi execute-template '{{ dict "key1" "value1" "key2" (dict) |
pruneEmptyDicts | toJson }}'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.34.2/pkg/cmd/testdata/scripts/templatevars.txtar
new/chezmoi-2.34.3/pkg/cmd/testdata/scripts/templatevars.txtar
--- old/chezmoi-2.34.2/pkg/cmd/testdata/scripts/templatevars.txtar
2023-06-17 02:27:17.000000000 +0200
+++ new/chezmoi-2.34.3/pkg/cmd/testdata/scripts/templatevars.txtar
2023-07-03 09:12:43.000000000 +0200
@@ -18,10 +18,8 @@
exec chezmoi execute-template '{{ .chezmoi.os }}'
[darwin] stdout darwin
[freebsd] stdout freebsd
-[illumos] stdout illumos
[linux] stdout linux
[openbsd] stdout openbsd
-[solaris] stdout solaris
[windows] stdout windows
exec chezmoi execute-template '{{ .chezmoi.sourceDir }}'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.34.2/pkg/shell/shellcgo.go
new/chezmoi-2.34.3/pkg/shell/shellcgo.go
--- old/chezmoi-2.34.2/pkg/shell/shellcgo.go 2023-06-17 02:27:17.000000000
+0200
+++ new/chezmoi-2.34.3/pkg/shell/shellcgo.go 2023-07-03 09:12:43.000000000
+0200
@@ -1,9 +1,7 @@
-//go:build (cgo && aix) || (cgo && android) || (cgo && darwin) || (cgo &&
dragonfly) || (cgo && freebsd) || (cgo && illumos) || (cgo && linux) || (cgo &&
netbsd) || (cgo && openbsd) || (cgo && solaris)
+//go:build (cgo && aix) || (cgo && android) || (cgo && darwin) || (cgo &&
dragonfly) || (cgo && freebsd) || (cgo && linux) || (cgo && netbsd) || (cgo &&
openbsd)
package shell
-// #cgo solaris CFLAGS: -D_POSIX_PTHREAD_SEMANTICS=1
-// #cgo illumos CFLAGS: -D_POSIX_PTHREAD_SEMANTICS=1
// #include <errno.h>
// #include <pwd.h>
// #include <stdlib.h>
++++++ chezmoi.obsinfo ++++++
--- /var/tmp/diff_new_pack.wUys7o/_old 2023-07-05 15:31:20.542844783 +0200
+++ /var/tmp/diff_new_pack.wUys7o/_new 2023-07-05 15:31:20.546844807 +0200
@@ -1,5 +1,5 @@
name: chezmoi
-version: 2.34.2
-mtime: 1686961637
-commit: 473189051ec4950baa342f19ae7a824f0c1ded1f
+version: 2.34.3
+mtime: 1688368363
+commit: 439ccf8f4f092a3b1f909e430775db933dc7c740
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/chezmoi/vendor.tar.gz
/work/SRC/openSUSE:Factory/.chezmoi.new.23466/vendor.tar.gz differ: char 5,
line 1
