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-01-16 17:59:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chezmoi (Old)
and /work/SRC/openSUSE:Factory/.chezmoi.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chezmoi"
Mon Jan 16 17:59:41 2023 rev:10 rq:1058649 version:2.29.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/chezmoi/chezmoi.changes 2023-01-10
15:00:14.333350068 +0100
+++ /work/SRC/openSUSE:Factory/.chezmoi.new.32243/chezmoi.changes
2023-01-16 18:02:18.527959803 +0100
@@ -1,0 +2,14 @@
+Mon Jan 16 09:33:08 UTC 2023 - Filippo Bonazzi <filippo.bona...@suse.com>
+
+- Remove `changesgenerate` service
+ Upstream provides a better changelog than the one this service is able to
+ generate from git commits.
+
+-------------------------------------------------------------------
+Mon Jan 16 09:29:09 UTC 2023 - Filippo Bonazzi <filippo.bona...@suse.com>
+
+- Update to version 2.29.2:
+ * feat: Add keepassxc.prompt config variable
+ * chore: Update dependencies
+
+-------------------------------------------------------------------
Old:
----
chezmoi-2.29.1.obscpio
New:
----
chezmoi-2.29.2.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chezmoi.spec ++++++
--- /var/tmp/diff_new_pack.HT3Ami/_old 2023-01-16 18:02:19.227963538 +0100
+++ /var/tmp/diff_new_pack.HT3Ami/_new 2023-01-16 18:02:19.231963559 +0100
@@ -17,7 +17,7 @@
Name: chezmoi
-Version: 2.29.1
+Version: 2.29.2
Release: 0
Summary: A multi-host manager for dotfiles
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.HT3Ami/_old 2023-01-16 18:02:19.271963772 +0100
+++ /var/tmp/diff_new_pack.HT3Ami/_new 2023-01-16 18:02:19.275963794 +0100
@@ -2,10 +2,9 @@
<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.29.1</param>
+ <param name="revision">v2.29.2</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
- <param name="changesgenerate">enable</param>
</service>
<service name="go_modules" mode="manual"/>
<service name="tar" mode="buildtime"/>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.HT3Ami/_old 2023-01-16 18:02:19.299963921 +0100
+++ /var/tmp/diff_new_pack.HT3Ami/_new 2023-01-16 18:02:19.299963921 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/twpayne/chezmoi.git</param>
- <param
name="changesrevision">5e7063ec11bb85efcf8e0c152dcd7dd674ed2d90</param></service></servicedata>
+ <param
name="changesrevision">b9536aae9100a2367e7b5baad8a7e251542c45bd</param></service></servicedata>
(No newline at EOF)
++++++ chezmoi-2.29.1.obscpio -> chezmoi-2.29.2.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/.github/workflows/main.yml
new/chezmoi-2.29.2/.github/workflows/main.yml
--- old/chezmoi-2.29.1/.github/workflows/main.yml 2023-01-02
15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/.github/workflows/main.yml 2023-01-15
15:35:48.000000000 +0100
@@ -10,11 +10,10 @@
- v*
env:
AGE_VERSION: 1.1.1
- GO_VERSION: 1.19.4
+ GO_VERSION: 1.19.5
GOFUMPT_VERSION: 0.4.0
GOLANGCI_LINT_VERSION: 1.50.1
GOVERSIONINFO_VERSION: 1.4.0
- TPARSE_VERSION: 0.11.1
jobs:
changes:
runs-on: ubuntu-20.04
@@ -31,6 +30,7 @@
- '**/*.ps1'
- '**/*.tmpl'
- '.github/workflows/**'
+ - '.goreleaser.yaml'
- 'Makefile'
- 'assets/docker/**'
- 'assets/scripts/**'
@@ -262,23 +262,18 @@
- name: run
run: |
go run . --version
- - name: install-tparse
- run: |
- curl -fsLO
https://github.com/mfridman/tparse/releases/download/v${TPARSE_VERSION}/tparse_linux_x86_64
- chmod a+x tparse_linux_x86_64
- sudo mv tparse_linux_x86_64 /usr/local/bin/tparse
- name: test-umask-022
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
env:
CHEZMOI_GITHUB_TOKEN: ${{ secrets.CHEZMOI_GITHUB_TOKEN }}
run: |
- go test -cover -json -ldflags="-X
github.com/twpayne/chezmoi/pkg/chezmoitest.umaskStr=0o022" -race ./... | tparse
+ go test -cover -ldflags="-X
github.com/twpayne/chezmoi/v2/pkg/chezmoitest.umaskStr=0o022" -race ./...
- name: test-umask-002
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
env:
CHEZMOI_GITHUB_TOKEN: ${{ secrets.CHEZMOI_GITHUB_TOKEN }}
run: |
- go test -cover -json -ldflags="-X
github.com/twpayne/chezmoi/pkg/chezmoitest.umaskStr=0o002" -race ./... | tparse
+ go test -cover -ldflags="-X
github.com/twpayne/chezmoi/v2/pkg/chezmoitest.umaskStr=0o002" -race ./...
- name: test-install.sh
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
run: |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/.goreleaser.yaml
new/chezmoi-2.29.2/.goreleaser.yaml
--- old/chezmoi-2.29.1/.goreleaser.yaml 2023-01-02 15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/.goreleaser.yaml 2023-01-15 15:35:48.000000000 +0100
@@ -83,11 +83,18 @@
- LICENSE
- README.md
- completions/*
- replacements:
- 386: i386
+ name_template: >-
+ {{- .ProjectName }}_
+ {{- .Version }}_
+ {{- .Os }}_
+ {{- if eq .Arch "386" }}i386
+ {{- else if eq .Arch "mips64" }}mips64_hardfloat
+ {{- else if eq .Arch "mips64le" }}mips64le_hardfloat
+ {{- else }}{{ .Arch }}{{ end -}}
format_overrides:
- goos: windows
format: zip
+ rlcp: true
- id: glibc
builds:
- chezmoi-cgo-glibc
@@ -96,6 +103,7 @@
- README.md
- completions/*
name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}-glibc_{{ .Arch
}}'
+ rlcp: true
- id: musl
builds:
- chezmoi-cgo-musl
@@ -104,6 +112,7 @@
- README.md
- completions/*
name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}-musl_{{ .Arch }}'
+ rlcp: true
changelog:
use: github-native
@@ -139,10 +148,13 @@
bindir: /usr/bin
overrides:
deb:
- file_name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{
.Arch }}'
- replacements:
- 386: i386
- arm: armel
+ file_name_template: >-
+ {{- .ProjectName }}_
+ {{- .Version }}_
+ {{- .Os }}_
+ {{- if eq .Arch "386" }}i386
+ {{- else if eq .Arch "arm" }}armel
+ {{- else }}{{ .Arch }}{{ end -}}
contents:
- src: completions/chezmoi-completion.bash
dst: /usr/share/bash-completion/completions/chezmoi
@@ -151,12 +163,14 @@
- src: completions/chezmoi.zsh
dst: /usr/share/zsh/vendor-completions/_chezmoi
rpm:
- file_name_template: '{{ .ProjectName }}-{{ .Version }}-{{ .Arch }}'
- replacements:
- amd64: x86_64
- 386: i686
- arm: armhfp
- arm64: aarch64
+ file_name_template: >-
+ {{- .ProjectName }}-
+ {{- .Version }}-
+ {{- if eq .Arch "amd64" }}x86_64
+ {{- else if eq .Arch "386" }}i686
+ {{- else if eq .Arch "arm" }}armhfp
+ {{- else if eq .Arch "arm64" }}aarch64
+ {{- else }}{{ .Arch }}{{ end -}}
contents:
- src: completions/chezmoi-completion.bash
dst: /usr/share/bash-completion/completions/chezmoi
@@ -234,3 +248,4 @@
prefix_template: '{{ .ProjectName }}-{{ .Version }}/'
files:
- COMMIT
+ rlcp: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/LICENSE new/chezmoi-2.29.2/LICENSE
--- old/chezmoi-2.29.1/LICENSE 2023-01-02 15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/LICENSE 2023-01-15 15:35:48.000000000 +0100
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2018-2022 Tom Payne
+Copyright (c) 2018-2023 Tom Payne
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/Makefile new/chezmoi-2.29.2/Makefile
--- old/chezmoi-2.29.1/Makefile 2023-01-02 15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/Makefile 2023-01-15 15:35:48.000000000 +0100
@@ -83,8 +83,8 @@
.PHONY: test
test:
- ${GO} test -ldflags="-X
github.com/twpayne/chezmoi/pkg/chezmoitest.umaskStr=0o022" ./...
- ${GO} test -ldflags="-X
github.com/twpayne/chezmoi/pkg/chezmoitest.umaskStr=0o002" ./...
+ ${GO} test -ldflags="-X
github.com/twpayne/chezmoi/v2/pkg/chezmoitest.umaskStr=0o022" ./...
+ ${GO} test -ldflags="-X
github.com/twpayne/chezmoi/v2/pkg/chezmoitest.umaskStr=0o002" ./...
.PHONY: test-docker
test-docker:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/assets/chezmoi.io/docs/license.md
new/chezmoi-2.29.2/assets/chezmoi.io/docs/license.md
--- old/chezmoi-2.29.1/assets/chezmoi.io/docs/license.md 2023-01-02
15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/assets/chezmoi.io/docs/license.md 2023-01-15
15:35:48.000000000 +0100
@@ -2,7 +2,7 @@
The MIT License (MIT)
-Copyright (c) 2018-2022 Tom Payne
+Copyright (c) 2018-2023 Tom Payne
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/assets/chezmoi.io/docs/links/articles-podcasts-and-videos.md.yaml
new/chezmoi-2.29.2/assets/chezmoi.io/docs/links/articles-podcasts-and-videos.md.yaml
---
old/chezmoi-2.29.1/assets/chezmoi.io/docs/links/articles-podcasts-and-videos.md.yaml
2023-01-02 15:40:28.000000000 +0100
+++
new/chezmoi-2.29.2/assets/chezmoi.io/docs/links/articles-podcasts-and-videos.md.yaml
2023-01-15 15:35:48.000000000 +0100
@@ -318,3 +318,8 @@
version: 2.24.0
title: 'Shit Hot Dotfiles'
url: https://kolv.in/posts/dotfile-managment
+- date: '2023-01-12'
+ version: 2.29.1
+ title: 'Chezmoiã§ããããã¯ãã¹ãã©ãããã©ã¼ã
dotfiles管çã®ã¹ã¹ã¡'
+ lang: JP
+ url:
https://deflis.hatenablog.com/entry/hatena-advent-calendar-2022-chezmoi-dotfiles
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/assets/chezmoi.io/docs/reference/configuration-file/variables.md.yaml
new/chezmoi-2.29.2/assets/chezmoi.io/docs/reference/configuration-file/variables.md.yaml
---
old/chezmoi-2.29.1/assets/chezmoi.io/docs/reference/configuration-file/variables.md.yaml
2023-01-02 15:40:28.000000000 +0100
+++
new/chezmoi-2.29.2/assets/chezmoi.io/docs/reference/configuration-file/variables.md.yaml
2023-01-15 15:35:48.000000000 +0100
@@ -192,6 +192,10 @@
description: KeePassXC CLI command
database:
description: KeePassXC database
+ prompt:
+ type: bool
+ default: '`true`'
+ description: Prompt for password
keeper:
args:
type: '[]string'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/assets/chezmoi.io/docs/reference/templates/1password-functions/onepasswordItemFields.md
new/chezmoi-2.29.2/assets/chezmoi.io/docs/reference/templates/1password-functions/onepasswordItemFields.md
---
old/chezmoi-2.29.1/assets/chezmoi.io/docs/reference/templates/1password-functions/onepasswordItemFields.md
2023-01-02 15:40:28.000000000 +0100
+++
new/chezmoi-2.29.2/assets/chezmoi.io/docs/reference/templates/1password-functions/onepasswordItemFields.md
2023-01-15 15:35:48.000000000 +0100
@@ -37,7 +37,7 @@
is equivalent to calling
```console
- $ op get item abcdefghijklmnopqrstuvwxyz --fields exampleLabel
+ $ op item get abcdefghijklmnopqrstuvwxyz --fields exampleLabel
```
!!! example
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestRelease.md
new/chezmoi-2.29.2/assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestRelease.md
---
old/chezmoi-2.29.1/assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestRelease.md
2023-01-02 15:40:28.000000000 +0100
+++
new/chezmoi-2.29.2/assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestRelease.md
2023-01-15 15:35:48.000000000 +0100
@@ -3,7 +3,7 @@
`gitHubLatestRelease` calls the GitHub API to retrieve the latest release about
the given *owner-repo*, returning structured data as defined by the [GitHub Go
API
-bindings](https://pkg.go.dev/github.com/google/go-github/v48/github#RepositoryRelease).
+bindings](https://pkg.go.dev/github.com/google/go-github/v49/github#RepositoryRelease).
Calls to `gitHubLatestRelease` are cached so calling `gitHubLatestRelease` with
the same *owner-repo* will only result in one call to the GitHub API.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestTag.md
new/chezmoi-2.29.2/assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestTag.md
---
old/chezmoi-2.29.1/assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestTag.md
2023-01-02 15:40:28.000000000 +0100
+++
new/chezmoi-2.29.2/assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestTag.md
2023-01-15 15:35:48.000000000 +0100
@@ -2,7 +2,7 @@
`gitHubLatestTag` calls the GitHub API to retrieve the latest tag for the given
*owner-repo*, returning structured data as defined by the [GitHub Go API
-bindings](https://pkg.go.dev/github.com/google/go-github/v48/github#RepositoryTag).
+bindings](https://pkg.go.dev/github.com/google/go-github/v49/github#RepositoryTag).
Calls to `gitHubLatestTag` are cached so calling `gitHubLatestTag` with the
same *owner-repo* will only result in one call to the GitHub API.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/assets/chezmoi.io/docs/reference/templates/keepassxc-functions/index.md
new/chezmoi-2.29.2/assets/chezmoi.io/docs/reference/templates/keepassxc-functions/index.md
---
old/chezmoi-2.29.1/assets/chezmoi.io/docs/reference/templates/keepassxc-functions/index.md
2023-01-02 15:40:28.000000000 +0100
+++
new/chezmoi-2.29.2/assets/chezmoi.io/docs/reference/templates/keepassxc-functions/index.md
2023-01-15 15:35:48.000000000 +0100
@@ -11,4 +11,5 @@
The command used can by changed by setting the `keepassxc.command`
configuration variable, and extra arguments can be added by setting
-`keepassxc.args`.
+`keepassxc.args`. Also, you can disable the password prompt by setting
+`keepassxc.prompt` to `false`.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/assets/chezmoi.io/docs/user-guide/encryption/age.md
new/chezmoi-2.29.2/assets/chezmoi.io/docs/user-guide/encryption/age.md
--- old/chezmoi-2.29.1/assets/chezmoi.io/docs/user-guide/encryption/age.md
2023-01-02 15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/assets/chezmoi.io/docs/user-guide/encryption/age.md
2023-01-15 15:35:48.000000000 +0100
@@ -56,8 +56,8 @@
!!! info
- The builtin age encryption not support passphrases, symmetric encryption,
- or SSH keys.
+ The builtin age encryption does not support passphrases, symmetric
+ encryption, or SSH keys.
Passphrases are not supported because chezmoi needs to decrypt files
regularly, e.g. when running a `chezmoi diff` or a `chezmoi status`
@@ -68,8 +68,8 @@
issue](https://github.com/twpayne/chezmoi/issues/new?assignees=&labels=enhancement&template=02_feature_request.md&title=)
if you want this.
- SSH keys are not supported as the author of age [explicitly recommends not
- using them](https://pkg.go.dev/filippo.io/age#hdr-Key_management):
+ SSH keys are not supported as the [age documentation explicitly recommends
+ not using them](https://pkg.go.dev/filippo.io/age#hdr-Key_management):
> When integrating age into a new system, it's recommended that you only
> support X25519 keys, and not SSH keys. The latter are supported for
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/assets/chezmoi.io/docs/user-guide/encryption/gpg.md
new/chezmoi-2.29.2/assets/chezmoi.io/docs/user-guide/encryption/gpg.md
--- old/chezmoi-2.29.1/assets/chezmoi.io/docs/user-guide/encryption/gpg.md
2023-01-02 15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/assets/chezmoi.io/docs/user-guide/encryption/gpg.md
2023-01-15 15:35:48.000000000 +0100
@@ -2,7 +2,7 @@
chezmoi supports encrypting files with [gpg](https://www.gnupg.org/). Encrypted
files are stored in the source state and automatically be decrypted when
-generating the target state or printing a file's contents with `chezmoi cat`.
+generating the target state or editing a file contents with `chezmoi edit`.
## Asymmetric (private/public-key) encryption
@@ -24,25 +24,6 @@
and store the encrypted file in the source state. The file will automatically
be decrypted when generating the target state.
-!!! hint
-
- The `gpg.recipient` key must be ultimately trusted, otherwise encryption
- will fail because gpg will prompt for input, which chezmoi does not handle.
- You can check the trust level by running:
-
- ```console
- $ gpg --export-ownertrust
- ```
-
- The trust level for the recipient's key should be `6`. If it is not, you
- can change the trust level by running:
-
- ```console
- $ gpg --edit-key $RECIPIENT
- ```
-
- Enter `trust` at the prompt and chose `5 = I trust ultimately`.
-
## Symmetric encryption
Specify symmetric encryption in your configuration file:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/assets/chezmoi.io/docs/user-guide/encryption/index.md
new/chezmoi-2.29.2/assets/chezmoi.io/docs/user-guide/encryption/index.md
--- old/chezmoi-2.29.1/assets/chezmoi.io/docs/user-guide/encryption/index.md
2023-01-02 15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/assets/chezmoi.io/docs/user-guide/encryption/index.md
2023-01-15 15:35:48.000000000 +0100
@@ -1,9 +1,10 @@
# Encryption
-chezmoi supports encrypting whole files with [age](https://age-encryption.org)
-and [gpg](https://www.gnupg.com/). Encrypted files are stored in ASCII-armored
-format in the source directory with the `encrypted_` attribute and are
-automatically decrypted when needed.
+chezmoi supports encrypting files with [age](https://age-encryption.org)
+and [gpg](https://www.gnupg.com/).
+
+Encrypted files are stored in ASCII-armored format in the source directory with
+the `encrypted_` attribute and are automatically decrypted when needed.
Add files to be encrypted with the `--encrypt` flag, for example:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/assets/chezmoi.io/docs/user-guide/frequently-asked-questions/troubleshooting.md
new/chezmoi-2.29.2/assets/chezmoi.io/docs/user-guide/frequently-asked-questions/troubleshooting.md
---
old/chezmoi-2.29.1/assets/chezmoi.io/docs/user-guide/frequently-asked-questions/troubleshooting.md
2023-01-02 15:40:28.000000000 +0100
+++
new/chezmoi-2.29.2/assets/chezmoi.io/docs/user-guide/frequently-asked-questions/troubleshooting.md
2023-01-15 15:35:48.000000000 +0100
@@ -151,6 +151,26 @@
`import`, `init`, `state`, `unmanage`, and `update`. Commands that take a read
lock include `diff`, `status`, and `verify`.
+## chezmoi reports `chezmoi: fork/exec /tmp/XXXXXXXXXX.XX: exec format error`
when executing a template script
+
+This error occurs when you have a newline before the `#!` in your script.
+Suppress the newline by including a `-` before the closing `}}` on the first
+line.
+
+For example, if your template script begins with
+
+```
+{{ if eq .chezmoi.os "linux" }}
+#!/bin/sh
+```
+
+change this to
+
+```
+{{ if eq .chezmoi.os "linux" -}}
+#!/bin/sh
+```
+
## chezmoi reports `chezmoi: fork/exec /tmp/XXXXXXXXXX.XX: permission denied`
when executing a script
This error occurs when your temporary directory is mounted with the `noexec`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/assets/chezmoi.io/mkdocs.yml
new/chezmoi-2.29.2/assets/chezmoi.io/mkdocs.yml
--- old/chezmoi-2.29.1/assets/chezmoi.io/mkdocs.yml 2023-01-02
15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/assets/chezmoi.io/mkdocs.yml 2023-01-15
15:35:48.000000000 +0100
@@ -2,7 +2,7 @@
site_url: https://chezmoi.io
site_description: Manage your dotfiles across multiple machines, securely.
site_author: Tom Payne
-copyright: Copyright © Tom Payne 2018-2022
+copyright: Copyright © Tom Payne 2018-2023
repo_name: twpayne/chezmoi
repo_url: https://github.com/twpayne/chezmoi
edit_uri: edit/master/assets/chezmoi.io/docs/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/go.mod new/chezmoi-2.29.2/go.mod
--- old/chezmoi-2.29.1/go.mod 2023-01-02 15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/go.mod 2023-01-15 15:35:48.000000000 +0100
@@ -6,17 +6,17 @@
filippo.io/age v1.1.1
github.com/Masterminds/sprig/v3 v3.2.3
github.com/aws/aws-sdk-go-v2 v1.17.3
- github.com/aws/aws-sdk-go-v2/config v1.18.7
- github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.17.0
- github.com/bmatcuk/doublestar/v4 v4.4.0
+ github.com/aws/aws-sdk-go-v2/config v1.18.8
+ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.18.1
+ github.com/bmatcuk/doublestar/v4 v4.6.0
github.com/bradenhilton/mozillainstallhash v1.0.0
github.com/charmbracelet/bubbles v0.14.0
github.com/charmbracelet/bubbletea v0.23.1
github.com/charmbracelet/glamour v0.6.0
github.com/coreos/go-semver v0.3.0
github.com/fsnotify/fsnotify v1.6.0
- github.com/go-git/go-git/v5 v5.5.1
- github.com/google/go-github/v48 v48.2.0
+ github.com/go-git/go-git/v5 v5.5.2
+ github.com/google/go-github/v49 v49.1.0
github.com/google/renameio/v2 v2.0.0
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
github.com/mitchellh/mapstructure v1.5.0
@@ -25,7 +25,7 @@
github.com/pelletier/go-toml/v2 v2.0.6
github.com/rogpeppe/go-internal v1.9.0
github.com/rs/zerolog v1.28.0
- github.com/sergi/go-diff v1.1.0
+ github.com/sergi/go-diff v1.3.1
github.com/spf13/cobra v1.6.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.1
@@ -34,15 +34,15 @@
github.com/twpayne/go-xdg/v6 v6.0.0
github.com/ulikunitz/xz v0.5.11
github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1
- github.com/zalando/go-keyring v0.2.1
+ github.com/zalando/go-keyring v0.2.2
go.etcd.io/bbolt v1.3.7-0.20220226045046-fd5535f71f48
go.uber.org/multierr v1.9.0
- golang.org/x/crypto v0.4.0
- golang.org/x/exp v0.0.0-20221230185412-738e83a70c30
- golang.org/x/oauth2 v0.3.0
+ golang.org/x/crypto v0.5.0
+ golang.org/x/exp v0.0.0-20230113213754-f9f960f08ad4
+ golang.org/x/oauth2 v0.4.0
golang.org/x/sync v0.1.0
- golang.org/x/sys v0.3.0
- golang.org/x/term v0.3.0
+ golang.org/x/sys v0.4.0
+ golang.org/x/term v0.4.0
gopkg.in/ini.v1 v1.67.0
gopkg.in/yaml.v3 v3.0.1
howett.net/plist v1.0.0
@@ -53,20 +53,20 @@
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.0 // indirect
github.com/Microsoft/go-winio v0.6.0 // indirect
- github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 //
indirect
+ github.com/ProtonMail/go-crypto v0.0.0-20230113180642-068501e20d67 //
indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/alecthomas/chroma v0.10.0 // indirect
github.com/alessio/shellescape v1.4.1 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
- github.com/aws/aws-sdk-go-v2/credentials v1.13.7 // indirect
+ github.com/aws/aws-sdk-go-v2/credentials v1.13.8 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 //
indirect
- github.com/aws/aws-sdk-go-v2/service/sso v1.11.28 // indirect
- github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11 // indirect
- github.com/aws/aws-sdk-go-v2/service/sts v1.17.7 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 // indirect
github.com/aws/smithy-go v1.13.5 // indirect
github.com/aymanbagabas/go-osc52 v1.2.1 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
@@ -77,7 +77,7 @@
github.com/containerd/console v1.0.3 // indirect
github.com/danieljoos/wincred v1.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/dlclark/regexp2 v1.7.0 // indirect
+ github.com/dlclark/regexp2 v1.8.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.4.0 // indirect
@@ -118,12 +118,10 @@
github.com/yuin/goldmark-emoji v1.0.1 // indirect
go.uber.org/atomic v1.10.0 // indirect
golang.org/x/mod v0.7.0 // indirect
- golang.org/x/net v0.4.0 // indirect
- golang.org/x/text v0.5.0 // indirect
- golang.org/x/tools v0.4.0 // indirect
+ golang.org/x/net v0.5.0 // indirect
+ golang.org/x/text v0.6.0 // indirect
+ golang.org/x/tools v0.5.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
)
-
-exclude github.com/sergi/go-diff v1.2.0 //
https://github.com/sergi/go-diff/issues/123
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/go.sum new/chezmoi-2.29.2/go.sum
--- old/chezmoi-2.29.1/go.sum 2023-01-02 15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/go.sum 2023-01-15 15:35:48.000000000 +0100
@@ -11,8 +11,9 @@
github.com/Microsoft/go-winio v0.5.2/go.mod
h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
github.com/Microsoft/go-winio v0.6.0
h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
github.com/Microsoft/go-winio v0.6.0/go.mod
h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
-github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4
h1:ra2OtmuW0AE5csawV4YXMNGNQQXvLRps3z2Z59OPO+I=
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4/go.mod
h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8=
+github.com/ProtonMail/go-crypto v0.0.0-20230113180642-068501e20d67
h1:prYO7+yhqRjrP/lryCKZG4ieyeoKE40r8BKokURLd5M=
+github.com/ProtonMail/go-crypto v0.0.0-20230113180642-068501e20d67/go.mod
h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8=
github.com/acomagu/bufpipe v1.0.3
h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk=
github.com/acomagu/bufpipe v1.0.3/go.mod
h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
github.com/alecthomas/chroma v0.10.0
h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
@@ -27,10 +28,10 @@
github.com/atotto/clipboard v0.1.4/go.mod
h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
github.com/aws/aws-sdk-go-v2 v1.17.3
h1:shN7NlnVzvDUgPQ+1rLMSxY8OWRNDRYtiqe0p/PgrhY=
github.com/aws/aws-sdk-go-v2 v1.17.3/go.mod
h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
-github.com/aws/aws-sdk-go-v2/config v1.18.7
h1:V94lTcix6jouwmAsgQMAEBozVAGJMFhVj+6/++xfe3E=
-github.com/aws/aws-sdk-go-v2/config v1.18.7/go.mod
h1:OZYsyHFL5PB9UpyS78NElgKs11qI/B5KJau2XOJDXHA=
-github.com/aws/aws-sdk-go-v2/credentials v1.13.7
h1:qUUcNS5Z1092XBFT66IJM7mYkMwgZ8fcC8YDIbEwXck=
-github.com/aws/aws-sdk-go-v2/credentials v1.13.7/go.mod
h1:AdCcbZXHQCjJh6NaH3pFaw8LUeBFn5+88BZGMVGuBT8=
+github.com/aws/aws-sdk-go-v2/config v1.18.8
h1:lDpy0WM8AHsywOnVrOHaSMfpaiV2igOw8D7svkFkXVA=
+github.com/aws/aws-sdk-go-v2/config v1.18.8/go.mod
h1:5XCmmyutmzzgkpk/6NYTjeWb6lgo9N170m1j6pQkIBs=
+github.com/aws/aws-sdk-go-v2/credentials v1.13.8
h1:vTrwTvv5qAwjWIGhZDSBH/oQHuIQjGmD232k01FUh6A=
+github.com/aws/aws-sdk-go-v2/credentials v1.13.8/go.mod
h1:lVa4OHbvgjVot4gmh1uouF1ubgexSCN92P6CJQpT0t8=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21
h1:j9wi1kQ8b+e0FBVHxCqCGo4kxDU175hoDHcWAi0sauU=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21/go.mod
h1:ugwW57Z5Z48bpvUyZuaPy4Kv+vEfJWnIrky7RmkBvJg=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27
h1:I3cakv2Uy1vNmmhRQmFptYDxOvBnwCdNwyw63N0RaRU=
@@ -41,14 +42,14 @@
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28/go.mod
h1:yRZVr/iT0AqyHeep00SZ4YfBAKojXz08w3XMBscdi0c=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21
h1:5C6XgTViSb0bunmU57b3CT+MhxULqHH2721FVA+/kDM=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21/go.mod
h1:lRToEJsn+DRA9lW4O9L9+/3hjTkUzlzyzHqn8MTds5k=
-github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.17.0
h1:6W6BLZcXytRJsVvc2gGwxKE4wbMSlWqdxZivBP/E+ys=
-github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.17.0/go.mod
h1:jAeo/PdIJZuDSwsvxJS94G4d6h8tStj7WXVuKwLHWU8=
-github.com/aws/aws-sdk-go-v2/service/sso v1.11.28
h1:gItLq3zBYyRDPmqAClgzTH8PBjDQGeyptYGHIwtYYNA=
-github.com/aws/aws-sdk-go-v2/service/sso v1.11.28/go.mod
h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11
h1:KCacyVSs/wlcPGx37hcbT3IGYO8P8Jx+TgSDhAXtQMY=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11/go.mod
h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8=
-github.com/aws/aws-sdk-go-v2/service/sts v1.17.7
h1:9Mtq1KM6nD8/+HStvWcvYnixJ5N85DX+P+OY3kI3W2k=
-github.com/aws/aws-sdk-go-v2/service/sts v1.17.7/go.mod
h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I=
+github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.18.1
h1:g7sJnSibd3KdECc7nT6BHvisdqX8eS3H0m4Rzq6yn/0=
+github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.18.1/go.mod
h1:jAeo/PdIJZuDSwsvxJS94G4d6h8tStj7WXVuKwLHWU8=
+github.com/aws/aws-sdk-go-v2/service/sso v1.12.0
h1:/2gzjhQowRLarkkBOGPXSRnb8sQ2RVsjdG1C/UliK/c=
+github.com/aws/aws-sdk-go-v2/service/sso v1.12.0/go.mod
h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0
h1:Jfly6mRxk2ZOSlbCvZfKNS7TukSx1mIzhSsqZ/IGSZI=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0/go.mod
h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8=
+github.com/aws/aws-sdk-go-v2/service/sts v1.18.0
h1:kOO++CYo50RcTFISESluhWEi5Prhg+gaSs4whWabiZU=
+github.com/aws/aws-sdk-go-v2/service/sts v1.18.0/go.mod
h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I=
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=
@@ -56,8 +57,8 @@
github.com/aymanbagabas/go-osc52 v1.2.1/go.mod
h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4=
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/bmatcuk/doublestar/v4 v4.4.0
h1:LmAwNwhjEbYtyVLzjcP/XeVw4nhuScHGkF/XWXnvIic=
-github.com/bmatcuk/doublestar/v4 v4.4.0/go.mod
h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/bmatcuk/doublestar/v4 v4.6.0
h1:HTuxyug8GyFbRkrffIpzNCSK4luc0TY3wzXvzIZhEXc=
+github.com/bmatcuk/doublestar/v4 v4.6.0/go.mod
h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
github.com/bradenhilton/cityhash v1.0.0
h1:1QauDCwfxwIGwO2jBTJdEBqXgfCusAgQOSgdl4RsTMI=
github.com/bradenhilton/cityhash v1.0.0/go.mod
h1:Wmb8yW1egA9ulrsRX4mxfYx5zq4nBWOCZ+j63oK6uz8=
github.com/bradenhilton/mozillainstallhash v1.0.0
h1:QL9byVGb4FrVOI7MubnME3uPNj5R78tqYQPlxuBmXMw=
@@ -89,15 +90,14 @@
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/danieljoos/wincred v1.1.0/go.mod
h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg=
github.com/danieljoos/wincred v1.1.2
h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
github.com/danieljoos/wincred v1.1.2/go.mod
h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0=
github.com/davecgh/go-spew v1.1.0/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1
h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dlclark/regexp2 v1.4.0/go.mod
h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
-github.com/dlclark/regexp2 v1.7.0
h1:7lJfhqlPssTb1WQx4yvTHN0uElPEv52sbaECrAQxjAo=
-github.com/dlclark/regexp2 v1.7.0/go.mod
h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.8.0
h1:rJD5HeGIT/2b5CDk63FVCwZA3qgYElfg+oQK7uH5pfE=
+github.com/dlclark/regexp2 v1.8.0/go.mod
h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
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=
@@ -112,10 +112,9 @@
github.com/go-git/go-billy/v5 v5.4.0/go.mod
h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg=
github.com/go-git/go-git-fixtures/v4 v4.3.1
h1:y5z6dd3qi8Hl+stezc8p3JxDkoTRqMAlKnXHuzrfjTQ=
github.com/go-git/go-git-fixtures/v4 v4.3.1/go.mod
h1:8LHG1a3SRW71ettAD/jW13h8c6AqjVSeL11RAdgaqpo=
-github.com/go-git/go-git/v5 v5.5.1
h1:5vtv2TB5PM/gPM+EvsHJ16hJh4uAkdGcKilcwY7FYwo=
-github.com/go-git/go-git/v5 v5.5.1/go.mod
h1:uz5PQ3d0gz7mSgzZhSJToM6ALPaKCdSnl58/Xb5hzr8=
+github.com/go-git/go-git/v5 v5.5.2
h1:v8lgZa5k9ylUw+OR/roJHTxR4QItsNFI5nKtAXFuynw=
+github.com/go-git/go-git/v5 v5.5.2/go.mod
h1:BE5hUJ5yaV2YMxhmaP4l6RBQ08kMxKSPD4BlxtH7OjI=
github.com/godbus/dbus/v5 v5.0.4/go.mod
h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/godbus/dbus/v5 v5.0.6/go.mod
h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/godbus/dbus/v5 v5.1.0
h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
github.com/godbus/dbus/v5 v5.1.0/go.mod
h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
@@ -130,8 +129,8 @@
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/v48 v48.2.0
h1:68puzySE6WqUY9KWmpOsDEQfDZsso98rT6pZcz9HqcE=
-github.com/google/go-github/v48 v48.2.0/go.mod
h1:dDlehKBDo850ZPvCTK0sEqTCVWcrGl2LcDiajkYi89Y=
+github.com/google/go-github/v49 v49.1.0
h1:LFkMgawGQ8dfzWLH/rNE0b3u1D3n6/dw7ZmrN3b+YFY=
+github.com/google/go-github/v49 v49.1.0/go.mod
h1:MUUzHPrhGniB6vUKa27y37likpipzG+BXXJbG04J334=
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=
@@ -247,8 +246,9 @@
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/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
+github.com/sergi/go-diff v1.3.1/go.mod
h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
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=
@@ -296,8 +296,8 @@
github.com/yuin/goldmark v1.5.3/go.mod
h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yuin/goldmark-emoji v1.0.1
h1:ctuWEyzGBwiucEqxzwe0SOYDXPAucOrE9NQC18Wa1os=
github.com/yuin/goldmark-emoji v1.0.1/go.mod
h1:2w1E6FEWLcDQkoTE+7HU6QF1F6SLlNGjRIBbIZQFqkQ=
-github.com/zalando/go-keyring v0.2.1
h1:MBRN/Z8H4U5wEKXiD67YbDAr5cj/DOStmSga70/2qKc=
-github.com/zalando/go-keyring v0.2.1/go.mod
h1:g63M2PPn0w5vjmEbwAX3ib5I+41zdm4esSETOn9Y6Dw=
+github.com/zalando/go-keyring v0.2.2
h1:f0xmpYiSrHtSNAVgwip93Cg8tuF45HJM6rHq/A5RI/4=
+github.com/zalando/go-keyring v0.2.2/go.mod
h1:sI3evg9Wvpw3+n4SqplGSJUMwtDeROfD4nsFz4z9PG0=
go.etcd.io/bbolt v1.3.7-0.20220226045046-fd5535f71f48
h1:edJBWeGHJkzwvJ8ReW0h50BRw6ikNVtrzhqtbseIAL8=
go.etcd.io/bbolt v1.3.7-0.20220226045046-fd5535f71f48/go.mod
h1:sh/Yp01MYDakY7RVfzKZn+T1WOMTTFJrWjl7+M73RXA=
go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
@@ -310,10 +310,10 @@
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod
h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod
h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.3.0/go.mod
h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
-golang.org/x/crypto v0.4.0/go.mod
h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
-golang.org/x/exp v0.0.0-20221230185412-738e83a70c30
h1:m9O6OTJ627iFnN2JIWfdqlZCzneRO6EEBsHXI25P8ws=
-golang.org/x/exp v0.0.0-20221230185412-738e83a70c30/go.mod
h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
+golang.org/x/crypto v0.5.0/go.mod
h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
+golang.org/x/exp v0.0.0-20230113213754-f9f960f08ad4
h1:CNkDRtCj8otM5CFz5jYvbr8ioXX8flVsLfDWEj0M5kk=
+golang.org/x/exp v0.0.0-20230113213754-f9f960f08ad4/go.mod
h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod
h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
@@ -325,10 +325,10 @@
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod
h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod
h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
-golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
-golang.org/x/oauth2 v0.3.0 h1:6l90koy8/LaBLmLu8jpHeHexzMwEita0zFfYlggy2F8=
-golang.org/x/oauth2 v0.3.0/go.mod
h1:rQrIauxkUhJ6CuwEXwymO2/eh4xz2ZWF1nBkcxS+tGk=
+golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
+golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
+golang.org/x/oauth2 v0.4.0 h1:NF0gk8LVPg1Ml7SSbGyySuoxdsXitj7TvgvuRxIMc/M=
+golang.org/x/oauth2 v0.4.0/go.mod
h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/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.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
@@ -356,27 +356,28 @@
golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.4.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/go.mod
h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod
h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
-golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
-golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
+golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg=
+golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
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.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
-golang.org/x/text v0.5.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/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod
h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod
h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod
h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.4.0 h1:7mTAgkunk3fr4GAloyyCasadO6h9zSsQZbwvcaIciV4=
-golang.org/x/tools v0.4.0/go.mod
h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
+golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4=
+golang.org/x/tools v0.5.0/go.mod
h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
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=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/internal/cmds/execute-template/main.go
new/chezmoi-2.29.2/internal/cmds/execute-template/main.go
--- old/chezmoi-2.29.1/internal/cmds/execute-template/main.go 2023-01-02
15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/internal/cmds/execute-template/main.go 2023-01-15
15:35:48.000000000 +0100
@@ -16,7 +16,7 @@
"text/template"
"github.com/Masterminds/sprig/v3"
- "github.com/google/go-github/v48/github"
+ "github.com/google/go-github/v49/github"
"github.com/google/renameio/v2/maybe"
"gopkg.in/yaml.v3"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/pkg/chezmoi/github.go
new/chezmoi-2.29.2/pkg/chezmoi/github.go
--- old/chezmoi-2.29.1/pkg/chezmoi/github.go 2023-01-02 15:40:28.000000000
+0100
+++ new/chezmoi-2.29.2/pkg/chezmoi/github.go 2023-01-15 15:35:48.000000000
+0100
@@ -5,7 +5,7 @@
"net/http"
"os"
- "github.com/google/go-github/v48/github"
+ "github.com/google/go-github/v49/github"
"golang.org/x/oauth2"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/pkg/chezmoi/glob.go
new/chezmoi-2.29.2/pkg/chezmoi/glob.go
--- old/chezmoi-2.29.1/pkg/chezmoi/glob.go 2023-01-02 15:40:28.000000000
+0100
+++ new/chezmoi-2.29.2/pkg/chezmoi/glob.go 2023-01-15 15:35:48.000000000
+0100
@@ -28,7 +28,12 @@
// Glob is like github.com/bmatcuk/doublestar/v4.Glob except that it does not
// follow symlinks.
func Glob(fileSystem vfs.FS, prefix string) ([]string, error) {
- return doublestar.Glob(lstatFS{
- wrapped: fileSystem,
- }, prefix, doublestar.WithFailOnIOErrors())
+ return doublestar.Glob(
+ lstatFS{
+ wrapped: fileSystem,
+ },
+ prefix,
+ doublestar.WithFailOnIOErrors(),
+ doublestar.WithNoFollow(),
+ )
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/pkg/chezmoitest/chezmoitest_unix.go
new/chezmoi-2.29.2/pkg/chezmoitest/chezmoitest_unix.go
--- old/chezmoi-2.29.1/pkg/chezmoitest/chezmoitest_unix.go 2023-01-02
15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/pkg/chezmoitest/chezmoitest_unix.go 2023-01-15
15:35:48.000000000 +0100
@@ -10,7 +10,7 @@
var (
// umaskStr is the umask used in tests represented as a string so it
can be
// set with the
- // -ldflags="-X
github.com/twpayne/chezmoi/pkg/chezmoitest.umaskStr=..."
+ // -ldflags="-X
github.com/twpayne/chezmoi/v2/pkg/chezmoitest.umaskStr=..."
// option to go build and go test.
umaskStr = "0o022"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/pkg/chezmoitest/chezmoitest_windows.go
new/chezmoi-2.29.2/pkg/chezmoitest/chezmoitest_windows.go
--- old/chezmoi-2.29.1/pkg/chezmoitest/chezmoitest_windows.go 2023-01-02
15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/pkg/chezmoitest/chezmoitest_windows.go 2023-01-15
15:35:48.000000000 +0100
@@ -3,7 +3,7 @@
var (
// umaskStr is the umask used in tests represented as a string so it
can be
// set with the
- // -ldflags="-X
github.com/twpayne/chezmoi/pkg/chezmoitest.umaskStr=..."
+ // -ldflags="-X
github.com/twpayne/chezmoi/v2/pkg/chezmoitest.umaskStr=..."
// option to go build and go test.
umaskStr = "0"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/pkg/cmd/config.go
new/chezmoi-2.29.2/pkg/cmd/config.go
--- old/chezmoi-2.29.1/pkg/cmd/config.go 2023-01-02 15:40:28.000000000
+0100
+++ new/chezmoi-2.29.2/pkg/cmd/config.go 2023-01-15 15:35:48.000000000
+0100
@@ -2388,6 +2388,7 @@
},
Keepassxc: keepassxcConfig{
Command: "keepassxc-cli",
+ Prompt: true,
},
Keeper: keeperConfig{
Command: "keeper",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/pkg/cmd/doctorcmd.go
new/chezmoi-2.29.2/pkg/cmd/doctorcmd.go
--- old/chezmoi-2.29.1/pkg/cmd/doctorcmd.go 2023-01-02 15:40:28.000000000
+0100
+++ new/chezmoi-2.29.2/pkg/cmd/doctorcmd.go 2023-01-15 15:35:48.000000000
+0100
@@ -19,7 +19,7 @@
"time"
"github.com/coreos/go-semver/semver"
- "github.com/google/go-github/v48/github"
+ "github.com/google/go-github/v49/github"
"github.com/spf13/cobra"
"github.com/twpayne/go-xdg/v6"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/pkg/cmd/githubtemplatefuncs.go
new/chezmoi-2.29.2/pkg/cmd/githubtemplatefuncs.go
--- old/chezmoi-2.29.1/pkg/cmd/githubtemplatefuncs.go 2023-01-02
15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/pkg/cmd/githubtemplatefuncs.go 2023-01-15
15:35:48.000000000 +0100
@@ -5,7 +5,7 @@
"fmt"
"strings"
- "github.com/google/go-github/v48/github"
+ "github.com/google/go-github/v49/github"
"github.com/twpayne/chezmoi/v2/pkg/chezmoi"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/pkg/cmd/keepassxctemplatefuncs.go
new/chezmoi-2.29.2/pkg/cmd/keepassxctemplatefuncs.go
--- old/chezmoi-2.29.1/pkg/cmd/keepassxctemplatefuncs.go 2023-01-02
15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/pkg/cmd/keepassxctemplatefuncs.go 2023-01-15
15:35:48.000000000 +0100
@@ -24,6 +24,7 @@
Command string `json:"command" mapstructure:"command"
yaml:"command"`
Database chezmoi.AbsPath `json:"database"
mapstructure:"database" yaml:"database"`
Args []string `json:"args" mapstructure:"args"
yaml:"args"`
+ Prompt bool `json:"prompt" mapstructure:"prompt"
yaml:"prompt"`
version *semver.Version
cache map[string]map[string]string
attachmentCache map[string]map[string]string
@@ -133,16 +134,19 @@
panic(errors.New("keepassxc.database not set"))
}
- if c.Keepassxc.password == "" {
+ cmd := exec.Command(name, args...)
+ if c.Keepassxc.password == "" && c.Keepassxc.Prompt {
password, err := c.readPassword(fmt.Sprintf("Insert password to
unlock %s: ", c.Keepassxc.Database))
if err != nil {
return nil, err
}
c.Keepassxc.password = password
+ cmd.Stdin = bytes.NewBufferString(c.Keepassxc.password + "\n")
+ } else {
+ cmd.Stdin = os.Stdin
}
- cmd := exec.Command(name, args...)
- cmd.Stdin = bytes.NewBufferString(c.Keepassxc.password + "\n")
cmd.Stderr = os.Stderr
+
output, err := chezmoilog.LogCmdOutput(cmd)
if err != nil {
return nil, newCmdOutputError(cmd, output, err)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/applyverbose.txtar
new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/applyverbose.txtar
--- old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/applyverbose.txtar
2023-01-02 15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/applyverbose.txtar
2023-01-15 15:35:48.000000000 +0100
@@ -1,6 +1,7 @@
# test that chezmoi apply --dry-run --verbose does not show scripts when
scripts are excluded from diffs
exec chezmoi apply --dry-run --verbose
-[!windows] cmp stdout golden/apply.diff
+[!windows] [umask:002] cmp stdout golden/apply-umask-002.diff
+[!windows] [umask:022] cmp stdout golden/apply-umask-022.diff
[windows] cmp stdout golden/apply-windows.diff
chhome home2/user
@@ -9,20 +10,28 @@
exec chezmoi apply --dry-run --force --verbose
! stdout .
--- golden/apply-windows.diff --
+-- golden/apply-umask-002.diff --
diff --git a/.file b/.file
-new file mode 100666
+new file mode 100664
index
0000000000000000000000000000000000000000..8a52cb9ce9551221716a53786ad74104c5902362
--- /dev/null
+++ b/.file
@@ -0,0 +1 @@
+# contents of .file
--- golden/apply.diff --
+-- golden/apply-umask-022.diff --
diff --git a/.file b/.file
new file mode 100644
index
0000000000000000000000000000000000000000..8a52cb9ce9551221716a53786ad74104c5902362
--- /dev/null
+++ b/.file
+@@ -0,0 +1 @@
++# contents of .file
+-- golden/apply-windows.diff --
+diff --git a/.file b/.file
+new file mode 100666
+index
0000000000000000000000000000000000000000..8a52cb9ce9551221716a53786ad74104c5902362
+--- /dev/null
++++ b/.file
@@ -0,0 +1 @@
+# contents of .file
-- home/user/.config/chezmoi/chezmoi.toml --
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/diffcommand_unix.txtar
new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/diffcommand_unix.txtar
--- old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/diffcommand_unix.txtar
2023-01-02 15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/diffcommand_unix.txtar
2023-01-15 15:35:48.000000000 +0100
@@ -6,7 +6,8 @@
# test that chezmoi diff --use-builtin-diff uses the builtin diff even if
diff.command is configured
exec chezmoi diff --use-builtin-diff
-cmp stdout golden/diff.diff
+[umask:002] cmp stdout golden/diff-umask-002.diff
+[umask:022] cmp stdout golden/diff-umask-022.diff
# test that chezmoi diff --reverse reverses the order of arguments
exec chezmoi diff --reverse
@@ -38,7 +39,15 @@
! exec chezmoi diff
stderr 'exit status 2'
--- golden/diff.diff --
+-- golden/diff-umask-002.diff --
+diff --git a/.file b/.file
+index
bd729e8ee3cc005444c67dc77eed60016886b5e0..b508963510528ab709627ec448026a10a64c72ef
100664
+--- a/.file
++++ b/.file
+@@ -1 +1 @@
+-# destination contents of .file
++# target contents of .file
+-- golden/diff-umask-022.diff --
diff --git a/.file b/.file
index
bd729e8ee3cc005444c67dc77eed60016886b5e0..b508963510528ab709627ec448026a10a64c72ef
100644
--- a/.file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/edgecases.txtar
new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/edgecases.txtar
--- old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/edgecases.txtar 2023-01-02
15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/edgecases.txtar 2023-01-15
15:35:48.000000000 +0100
@@ -1,30 +1,3 @@
-mkhomedir
-
-# test that chezmoi add --dry-run does not modify anything
-exec chezmoi add --dry-run $HOME${/}.file
-! exists $CHEZMOICONFIGDIR/chezmoistate.boltdb
-! exists $CHEZMOISOURCEDIR/dot_file
-
-# test that chezmoi add updates the persistent state
-exec chezmoi add $HOME${/}.file
-exists $CHEZMOICONFIGDIR/chezmoistate.boltdb
-exists $CHEZMOISOURCEDIR/dot_file
-exec chezmoi state dump
-stdout 634a4dd193c7b3b926d2e08026aa81a416fd41cec52854863b974af422495663 #
sha256sum of "# contents of .file\n"
-
-# test that chezmoi apply updates the state if the target and destination
states match, even if the last written state does not
-edit $CHEZMOISOURCEDIR/dot_file
-edit $HOME/.file
-cmp $HOME/.file $CHEZMOISOURCEDIR/dot_file
-exec chezmoi apply --dry-run $HOME${/}.file
-exec chezmoi state dump
-! stdout 2e9dd6a2a8c15b20d4b0882d4c0fb8c7eea4e8ece46818090b387132f9f84c34 #
sha256sum of "# contents of .file\n# edited\n"
-exec chezmoi apply $HOME${/}.file
-exec chezmoi state dump
-stdout 2e9dd6a2a8c15b20d4b0882d4c0fb8c7eea4e8ece46818090b387132f9f84c34 #
sha256sum of "# contents of .file\n# edited\n"
-
-chhome home2/user
-
# test that the source directory can be a symlink to another directory
symlink $HOME/.chezmoi -> $CHEZMOISOURCEDIR
exec chezmoi apply --source=$HOME${/}.chezmoi
@@ -35,13 +8,13 @@
exec chezmoi add $HOME${/}.dir/
! exists $CHEZMOISOURCEDIR/dot_dir/dot_dir
-chhome home3/user
+chhome home2/user
# test that chezmoi reports an inconsistent state error when a file should be
both removed and present
! exec chezmoi apply
stderr 'chezmoi: \.file: inconsistent state'
-chhome home4/user
+chhome home3/user
# test that chezmoi reports an error if there is a .chezmoi* file in the
.chezmoitemplates directory
! exec chezmoi status
@@ -56,7 +29,7 @@
stderr 'invalid or unsupported data format'
skip 'FIXME make the following test pass'
-chhome home6/user
+chhome home5/user
# test that chezmoi reports an inconsistent state error when a file should be
both removed and present, even if the file is not already present
! exec chezmoi apply
@@ -64,16 +37,16 @@
-- golden/.file --
# contents of .file
--- home2/user/.local/share/chezmoi/dot_file --
+-- home/user/.local/share/chezmoi/dot_file --
# contents of .file
--- home3/user/.file --
+-- home2/user/.file --
# contents of .file
--- home3/user/.local/share/chezmoi/.chezmoiremove --
+-- home2/user/.local/share/chezmoi/.chezmoiremove --
.file
--- home3/user/.local/share/chezmoi/dot_file --
+-- home2/user/.local/share/chezmoi/dot_file --
# contents of .file
--- home4/user/.local/share/chezmoi/.chezmoitemplates/.chezmoiignore --
--- home5/user/.local/share/chezmoi/.chezmoiremove --
+-- home3/user/.local/share/chezmoi/.chezmoitemplates/.chezmoiignore --
+-- home4/user/.local/share/chezmoi/.chezmoiremove --
.file
--- home6/user/.local/share/chezmoi/dot_file --
+-- home5/user/.local/share/chezmoi/dot_file --
# contents of .file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/edgecasesumask.txtar
new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/edgecasesumask.txtar
--- old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/edgecasesumask.txtar
1970-01-01 01:00:00.000000000 +0100
+++ new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/edgecasesumask.txtar
2023-01-15 15:35:48.000000000 +0100
@@ -0,0 +1,26 @@
+[!umask:022] skip
+
+mkhomedir
+
+# test that chezmoi add --dry-run does not modify anything
+exec chezmoi add --dry-run $HOME${/}.file
+! exists $CHEZMOICONFIGDIR/chezmoistate.boltdb
+! exists $CHEZMOISOURCEDIR/dot_file
+
+# test that chezmoi add updates the persistent state
+exec chezmoi add $HOME${/}.file
+exists $CHEZMOICONFIGDIR/chezmoistate.boltdb
+exists $CHEZMOISOURCEDIR/dot_file
+exec chezmoi state dump
+stdout 634a4dd193c7b3b926d2e08026aa81a416fd41cec52854863b974af422495663 #
sha256sum of "# contents of .file\n"
+
+# test that chezmoi apply updates the state if the target and destination
states match, even if the last written state does not
+edit $CHEZMOISOURCEDIR/dot_file
+edit $HOME/.file
+cmp $HOME/.file $CHEZMOISOURCEDIR/dot_file
+exec chezmoi apply --dry-run $HOME${/}.file
+exec chezmoi state dump
+! stdout 2e9dd6a2a8c15b20d4b0882d4c0fb8c7eea4e8ece46818090b387132f9f84c34 #
sha256sum of "# contents of .file\n# edited\n"
+exec chezmoi apply $HOME${/}.file
+exec chezmoi state dump
+stdout 2e9dd6a2a8c15b20d4b0882d4c0fb8c7eea4e8ece46818090b387132f9f84c34 #
sha256sum of "# contents of .file\n# edited\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/forget.txtar
new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/forget.txtar
--- old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/forget.txtar 2023-01-02
15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/forget.txtar 2023-01-15
15:35:48.000000000 +0100
@@ -6,9 +6,11 @@
exec chezmoi apply --force
exists $CHEZMOISOURCEDIR/dot_file
exec chezmoi state get --bucket=entryState --key=$WORK/home/user/.dir
-cmp stdout golden/state-get-dir.json
+[umask:002] cmp stdout golden/state-get-dir-umask-002.json
+[umask:022] cmp stdout golden/state-get-dir-umask-022.json
exec chezmoi state get --bucket=entryState --key=$WORK/home/user/.file
-cmp stdout golden/state-get-file.json
+[umask:002] cmp stdout golden/state-get-file-umask-002.json
+[umask:022] cmp stdout golden/state-get-file-umask-022.json
# test that chezmoi forget forgets a dir
exists $CHEZMOISOURCEDIR/dot_dir
@@ -29,12 +31,23 @@
exec chezmoi forget --force $HOME${/}.file
! exists $CHEZMOISOURCEDIR/home/dot_file
--- golden/state-get-dir.json --
+-- golden/state-get-dir-umask-002.json --
+{
+ "type": "dir",
+ "mode": 2147484157
+}
+-- golden/state-get-dir-umask-022.json --
{
"type": "dir",
"mode": 2147484141
}
--- golden/state-get-file.json --
+-- golden/state-get-file-umask-002.json --
+{
+ "type": "file",
+ "mode": 436,
+ "contentsSHA256":
"634a4dd193c7b3b926d2e08026aa81a416fd41cec52854863b974af422495663"
+}
+-- golden/state-get-file-umask-022.json --
{
"type": "file",
"mode": 420,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/issue-2649.txtar
new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/issue-2649.txtar
--- old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/issue-2649.txtar
2023-01-02 15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/issue-2649.txtar
1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-# test that chezmoi init clones a public dotfiles repo if git is installed
-[exec:git] exec chezmoi init --use-builtin-git=false chezmoi
-[exec:git] exists ${CHEZMOISOURCEDIR}/README.md
-
-chhome home2/user
-
-# test that chezmoi init clones a public dotfiles repo using builtin git
-exec chezmoi init --use-builtin-git=true chezmoi
-exists ${CHEZMOISOURCEDIR}/README.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/issue2092.txtar
new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/issue2092.txtar
--- old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/issue2092.txtar 2023-01-02
15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/issue2092.txtar 2023-01-15
15:35:48.000000000 +0100
@@ -2,17 +2,28 @@
# test that chezmoi dump warns when the config file has not been generated
exec chezmoi dump
-cmp stdout golden/dump.json
+[umask:002] cmp stdout golden/dump-umask-002.json
+[umask:022] cmp stdout golden/dump-umask-022.json
stderr 'config file template has changed'
# test that chezmoi dump does not return an error when the config file
template has been modified
exec chezmoi init
edit $CHEZMOICONFIGDIR${/}chezmoi.toml
exec chezmoi dump
-cmp stdout golden/dump.json
+[umask:002] cmp stdout golden/dump-umask-002.json
+[umask:022] cmp stdout golden/dump-umask-022.json
! stderr .
--- golden/dump.json --
+-- golden/dump-umask-002.json --
+{
+ ".file": {
+ "type": "file",
+ "name": ".file",
+ "contents": "# contents of .file\n",
+ "perm": 436
+ }
+}
+-- golden/dump-umask-022.json --
{
".file": {
"type": "file",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/issue2649.txtar
new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/issue2649.txtar
--- old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/issue2649.txtar 1970-01-01
01:00:00.000000000 +0100
+++ new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/issue2649.txtar 2023-01-15
15:35:48.000000000 +0100
@@ -0,0 +1,9 @@
+# test that chezmoi init clones a public dotfiles repo if git is installed
+[exec:git] exec chezmoi init --use-builtin-git=false chezmoi
+[exec:git] exists ${CHEZMOISOURCEDIR}/README.md
+
+chhome home2/user
+
+# test that chezmoi init clones a public dotfiles repo using builtin git
+exec chezmoi init --use-builtin-git=true chezmoi
+exists ${CHEZMOISOURCEDIR}/README.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/textconv.txtar
new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/textconv.txtar
--- old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/textconv.txtar 2023-01-02
15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/textconv.txtar 2023-01-15
15:35:48.000000000 +0100
@@ -3,11 +3,13 @@
# test that chezmoi diff uses textconv
exec chezmoi diff
-cmp stdout golden/diff
+[umask:002] cmp stdout golden/diff-umask-002
+[umask:022] cmp stdout golden/diff-umask-022
# test that chezmoi apply uses textconv
exec chezmoi apply --verbose
-cmp stdout golden/diff
+[umask:002] cmp stdout golden/diff-umask-002
+[umask:022] cmp stdout golden/diff-umask-022
cmp $HOME/file.txt golden/file.txt
# test that chezmoi apply uses textconv in interactive diffs
@@ -17,7 +19,18 @@
stdout '^ # CONTENTS OF FILE.TXT'
stdout '^-# EDITED'
--- golden/diff --
+-- golden/diff-overwrite --
+diff
+overwrite
+-- golden/diff-umask-002 --
+diff --git a/file.txt b/file.txt
+index
b0ebb2af412bf3812b0bf8c5d7b950feb8a701be..4d977287915d918f15ef3df13146c1fa58914d30
100664
+--- a/file.txt
++++ b/file.txt
+@@ -1 +1 @@
+-# PREVIOUS CONTENTS OF FILE.TXT
++# CONTENTS OF FILE.TXT
+-- golden/diff-umask-022 --
diff --git a/file.txt b/file.txt
index
b0ebb2af412bf3812b0bf8c5d7b950feb8a701be..4d977287915d918f15ef3df13146c1fa58914d30
100644
--- a/file.txt
@@ -25,9 +38,6 @@
@@ -1 +1 @@
-# PREVIOUS CONTENTS OF FILE.TXT
+# CONTENTS OF FILE.TXT
--- golden/diff-overwrite --
-diff
-overwrite
-- golden/file.txt --
# contents of file.txt
-- home/user/.config/chezmoi/chezmoi.yaml --
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/verify.txtar
new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/verify.txtar
--- old/chezmoi-2.29.1/pkg/cmd/testdata/scripts/verify.txtar 2023-01-02
15:40:28.000000000 +0100
+++ new/chezmoi-2.29.2/pkg/cmd/testdata/scripts/verify.txtar 2023-01-15
15:35:48.000000000 +0100
@@ -1,3 +1,5 @@
+[!umask:022] skip
+
mkhomedir golden
mkhomedir
mksourcedir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.29.1/pkg/cmd/upgradecmd.go
new/chezmoi-2.29.2/pkg/cmd/upgradecmd.go
--- old/chezmoi-2.29.1/pkg/cmd/upgradecmd.go 2023-01-02 15:40:28.000000000
+0100
+++ new/chezmoi-2.29.2/pkg/cmd/upgradecmd.go 2023-01-15 15:35:48.000000000
+0100
@@ -21,7 +21,7 @@
"strings"
"github.com/coreos/go-semver/semver"
- "github.com/google/go-github/v48/github"
+ "github.com/google/go-github/v49/github"
"github.com/spf13/cobra"
vfs "github.com/twpayne/go-vfs/v4"
++++++ chezmoi.obsinfo ++++++
--- /var/tmp/diff_new_pack.HT3Ami/_old 2023-01-16 18:02:19.667965885 +0100
+++ /var/tmp/diff_new_pack.HT3Ami/_new 2023-01-16 18:02:19.667965885 +0100
@@ -1,5 +1,5 @@
name: chezmoi
-version: 2.29.1
-mtime: 1672670428
-commit: 5e7063ec11bb85efcf8e0c152dcd7dd674ed2d90
+version: 2.29.2
+mtime: 1673793348
+commit: b9536aae9100a2367e7b5baad8a7e251542c45bd
++++++ vendor.tar.gz ++++++
++++ 115623 lines of diff (skipped)
