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-04-21 20:17:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chezmoi (Old)
and /work/SRC/openSUSE:Factory/.chezmoi.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chezmoi"
Fri Apr 21 20:17:19 2023 rev:20 rq:1082101 version:2.33.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/chezmoi/chezmoi.changes 2023-04-13
14:10:46.464305829 +0200
+++ /work/SRC/openSUSE:Factory/.chezmoi.new.1533/chezmoi.changes
2023-04-21 20:17:20.114422243 +0200
@@ -1,0 +2,9 @@
+Fri Apr 21 16:13:05 UTC 2023 - Filippo Bonazzi <filippo.bona...@suse.com>
+
+- Update to version 2.33.2:
+ * fix: Set CHEZMOI_ environment variables for modify_ scripts
+ * fix: Don't download ignored git-repo externals
+ * feat: Add .chezmoi.config template variable
+ * chore: Update dependencies
+
+-------------------------------------------------------------------
Old:
----
chezmoi-2.33.1.obscpio
New:
----
chezmoi-2.33.2.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chezmoi.spec ++++++
--- /var/tmp/diff_new_pack.qsu2hb/_old 2023-04-21 20:17:20.982427112 +0200
+++ /var/tmp/diff_new_pack.qsu2hb/_new 2023-04-21 20:17:20.986427135 +0200
@@ -17,7 +17,7 @@
Name: chezmoi
-Version: 2.33.1
+Version: 2.33.2
Release: 0
Summary: A multi-host manager for dotfiles
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.qsu2hb/_old 2023-04-21 20:17:21.026427359 +0200
+++ /var/tmp/diff_new_pack.qsu2hb/_new 2023-04-21 20:17:21.034427404 +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.33.1</param>
+ <param name="revision">v2.33.2</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>
++++++ chezmoi-2.33.1.obscpio -> chezmoi-2.33.2.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.33.1/assets/chezmoi.io/docs/links/links.yaml
new/chezmoi-2.33.2/assets/chezmoi.io/docs/links/links.yaml
--- old/chezmoi-2.33.1/assets/chezmoi.io/docs/links/links.yaml 2023-04-08
00:11:28.000000000 +0200
+++ new/chezmoi-2.33.2/assets/chezmoi.io/docs/links/links.yaml 2023-04-21
15:42:44.000000000 +0200
@@ -407,3 +407,8 @@
version: 2.32.0
title: 'Automating the Setup of a New Mac With All Your Apps, Preferences,
and Development Tools'
url:
https://www.moncefbelyamani.com/automating-the-setup-of-a-new-mac-with-all-your-apps-preferences-and-development-tools/
+- date: '2023-04-15'
+ version: 2.33.1
+ title: 'dotfiles ã®ç®¡çã« chezmoi ãå°å
¥ã㦠fswatch ã§èªå
apply ã§ããããã«ããg'
+ lang: JP
+ url: https://blog.mono0x.net/2023/04/15/chezmoi/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.33.1/assets/chezmoi.io/docs/reference/templates/variables.md
new/chezmoi-2.33.2/assets/chezmoi.io/docs/reference/templates/variables.md
--- old/chezmoi-2.33.1/assets/chezmoi.io/docs/reference/templates/variables.md
2023-04-08 00:11:28.000000000 +0200
+++ new/chezmoi-2.33.2/assets/chezmoi.io/docs/reference/templates/variables.md
2023-04-21 15:42:44.000000000 +0200
@@ -7,6 +7,7 @@
| `.chezmoi.arch` | string | Architecture, e.g. `amd64`, `arm`,
etc. as returned by
[runtime.GOARCH](https://pkg.go.dev/runtime?tab=doc#pkg-constants) |
| `.chezmoi.args` | []string | The arguments passed to the
`chezmoi` command, starting with the program command
|
| `.chezmoi.cacheDir` | string | The cache directory
|
+| `.chezmoi.config` | object | The configuration, as read from the
config file
|
| `.chezmoi.configFile` | string | The path to the configuration file
used by chezmoi
|
| `.chezmoi.executable` | string | The path to the `chezmoi`
executable, if available
|
| `.chezmoi.fqdnHostname` | string | The fully-qualified domain name
hostname of the machine chezmoi is running on
|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.33.1/go.mod new/chezmoi-2.33.2/go.mod
--- old/chezmoi-2.33.1/go.mod 2023-04-08 00:11:28.000000000 +0200
+++ new/chezmoi-2.33.2/go.mod 2023-04-21 15:42:44.000000000 +0200
@@ -7,8 +7,8 @@
github.com/Masterminds/sprig/v3 v3.2.3
github.com/Shopify/ejson v1.3.3
github.com/aws/aws-sdk-go-v2 v1.17.8
- github.com/aws/aws-sdk-go-v2/config v1.18.20
- github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.19.2
+ github.com/aws/aws-sdk-go-v2/config v1.18.21
+ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.19.4
github.com/bmatcuk/doublestar/v4 v4.6.0
github.com/bradenhilton/mozillainstallhash v1.0.1
github.com/charmbracelet/bubbles v0.15.0
@@ -21,13 +21,13 @@
github.com/google/renameio/v2 v2.0.0
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
github.com/itchyny/gojq v0.12.12
- github.com/klauspost/compress v1.16.4
+ github.com/klauspost/compress v1.16.5
github.com/mitchellh/mapstructure v1.5.0
github.com/muesli/combinator v0.3.0
github.com/muesli/termenv v0.15.1
github.com/pelletier/go-toml/v2 v2.0.7
github.com/rogpeppe/go-internal v1.10.0
- github.com/rs/zerolog v1.29.0
+ github.com/rs/zerolog v1.29.1
github.com/sergi/go-diff v1.1.0
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
@@ -42,7 +42,7 @@
go.etcd.io/bbolt v1.3.7
go.uber.org/multierr v1.11.0
golang.org/x/crypto v0.8.0
- golang.org/x/exp v0.0.0-20230321023759-10a507213a29
+ golang.org/x/exp v0.0.0-20230420155640-133eef4313cb
golang.org/x/oauth2 v0.7.0
golang.org/x/sync v0.1.0
golang.org/x/sys v0.7.0
@@ -55,22 +55,22 @@
require (
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-20230331115716-d34776aa93ec //
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-20230417170513-8ee5748c52b5 //
indirect
github.com/acomagu/bufpipe v1.0.4 // 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.19 // indirect
+ github.com/aws/aws-sdk-go-v2/credentials v1.13.20 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.2 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.32 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.26 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.33 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.26 //
indirect
- github.com/aws/aws-sdk-go-v2/service/sso v1.12.7 // indirect
- github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.7 // indirect
- github.com/aws/aws-sdk-go-v2/service/sts v1.18.8 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sso v1.12.8 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.8 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sts v1.18.9 // indirect
github.com/aws/smithy-go v1.13.5 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.33.1/go.sum new/chezmoi-2.33.2/go.sum
--- old/chezmoi-2.33.1/go.sum 2023-04-08 00:11:28.000000000 +0200
+++ new/chezmoi-2.33.2/go.sum 2023-04-21 15:42:44.000000000 +0200
@@ -4,16 +4,17 @@
filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
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
h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=
github.com/Masterminds/semver/v3 v3.2.0/go.mod
h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
+github.com/Masterminds/semver/v3 v3.2.1
h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
+github.com/Masterminds/semver/v3 v3.2.1/go.mod
h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
github.com/Masterminds/sprig/v3 v3.2.3
h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA=
github.com/Masterminds/sprig/v3 v3.2.3/go.mod
h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM=
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/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-20230217124315-7d5c6f04bbb8/go.mod
h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g=
-github.com/ProtonMail/go-crypto v0.0.0-20230331115716-d34776aa93ec
h1:eQusauqzE1cAFR5hGnwkuSmFxKoy3+j9/cVaDeYfjjs=
-github.com/ProtonMail/go-crypto v0.0.0-20230331115716-d34776aa93ec/go.mod
h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
+github.com/ProtonMail/go-crypto v0.0.0-20230417170513-8ee5748c52b5
h1:QXMwHM/lB4ZQhdEF7JUTNgYOJR/gWoFbgQ/2Aj1h3Dk=
+github.com/ProtonMail/go-crypto v0.0.0-20230417170513-8ee5748c52b5/go.mod
h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
github.com/Shopify/ejson v1.3.3 h1:dPzgmvFhUPTJIzwdF5DaqbwW1dWaoR8ADKRdSTy6Mss=
github.com/Shopify/ejson v1.3.3/go.mod
h1:VZMUtDzvBW/PAXRUF5fzp1ffb1ucT8MztrZXXLYZurw=
github.com/acomagu/bufpipe v1.0.4
h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ=
@@ -30,10 +31,10 @@
github.com/atotto/clipboard v0.1.4/go.mod
h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
github.com/aws/aws-sdk-go-v2 v1.17.8
h1:GMupCNNI7FARX27L7GjCJM8NgivWbRgpjNI/hOQjFS8=
github.com/aws/aws-sdk-go-v2 v1.17.8/go.mod
h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
-github.com/aws/aws-sdk-go-v2/config v1.18.20
h1:yYy+onqmLmDVZtx0mkqbx8aJPl+58V6ivLbLDZ2Qztc=
-github.com/aws/aws-sdk-go-v2/config v1.18.20/go.mod
h1:RWjF39RiDevmHw/+VaD8F0A36OPIPTHQQyRx0eZohnw=
-github.com/aws/aws-sdk-go-v2/credentials v1.13.19
h1:FWHJy9uggyQCSEhovtl/6W6rW9P6DSr62GUeY/TS6Eo=
-github.com/aws/aws-sdk-go-v2/credentials v1.13.19/go.mod
h1:2m4uvLvl5hvQezVkLeBBUGMEDm5GcUNc3016W6d3NGg=
+github.com/aws/aws-sdk-go-v2/config v1.18.21
h1:ENTXWKwE8b9YXgQCsruGLhvA9bhg+RqAsL9XEMEsa2c=
+github.com/aws/aws-sdk-go-v2/config v1.18.21/go.mod
h1:+jPQiVPz1diRnjj6VGqWcLK6EzNmQ42l7J3OqGTLsSY=
+github.com/aws/aws-sdk-go-v2/credentials v1.13.20
h1:oZCEFcrMppP/CNiS8myzv9JgOzq2s0d3v3MXYil/mxQ=
+github.com/aws/aws-sdk-go-v2/credentials v1.13.20/go.mod
h1:xtZnXErtbZ8YGXC3+8WfajpMBn5Ga/3ojZdxHq6iI8o=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.2
h1:jOzQAesnBFDmz93feqKnsTHsXrlwWORNZMFHMV+WLFU=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.2/go.mod
h1:cDh1p6XkSGSwSRIArWRc6+UqAQ7x4alQ0QfpVR6f+co=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.32
h1:dpbVNUjczQ8Ae3QKHbpHBpfvaVkRdesxpTOe9pTouhU=
@@ -44,14 +45,14 @@
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.33/go.mod
h1:zG2FcwjQarWaqXSCGpgcr3RSjZ6dHGguZSppUL0XR7Q=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.26
h1:uUt4XctZLhl9wBE1L8lobU3bVN8SNUP7T+olb0bWBO4=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.26/go.mod
h1:Bd4C/4PkVGubtNe5iMXu5BNnaBi/9t/UsFspPt4ram8=
-github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.19.2
h1:mRA8bnA0zdTvsGXmoZ6EOmTTmORjEV1uareB4GfzfK0=
-github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.19.2/go.mod
h1:QNYziZIPDbKmKRoTHi9wkgqVidknyiGHfig1UNOojqk=
-github.com/aws/aws-sdk-go-v2/service/sso v1.12.7
h1:rrYYhsvcvg6CDDoo4GHKtAWBFutS86CpmGvqHJHYL9w=
-github.com/aws/aws-sdk-go-v2/service/sso v1.12.7/go.mod
h1:GNIveDnP+aE3jujyUSH5aZ/rktsTM5EvtKnCqBZawdw=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.7
h1:Vjpjt3svuJ/u+eKRfycZwqLsLoxyuvvZyHMJSk+3k58=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.7/go.mod
h1:44qFP1g7pfd+U+sQHLPalAPKnyfTZjJsYR4xIwsJy5o=
-github.com/aws/aws-sdk-go-v2/service/sts v1.18.8
h1:SQ8pPoXfzuz4DImO4KAi9xhO4ANG0Ckb5clZ5GoRAPw=
-github.com/aws/aws-sdk-go-v2/service/sts v1.18.8/go.mod
h1:yyW88BEPXA2fGFyI2KCcZC3dNpiT0CZAHaF+i656/tQ=
+github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.19.4
h1:OExvHqoV5C/Ddo9KjPCf1HaQZC/h1jY1cCgWBivV8dY=
+github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.19.4/go.mod
h1:QNYziZIPDbKmKRoTHi9wkgqVidknyiGHfig1UNOojqk=
+github.com/aws/aws-sdk-go-v2/service/sso v1.12.8
h1:5cb3D6xb006bPTqEfCNaEA6PPEfBXxxy4NNeX/44kGk=
+github.com/aws/aws-sdk-go-v2/service/sso v1.12.8/go.mod
h1:GNIveDnP+aE3jujyUSH5aZ/rktsTM5EvtKnCqBZawdw=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.8
h1:NZaj0ngZMzsubWZbrEFSB4rgSQRbFq38Sd6KBxHuOIU=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.8/go.mod
h1:44qFP1g7pfd+U+sQHLPalAPKnyfTZjJsYR4xIwsJy5o=
+github.com/aws/aws-sdk-go-v2/service/sts v1.18.9
h1:Qf1aWwnsNkyAoqDqmdM3nHwN78XQjec27LjM6b9vyfI=
+github.com/aws/aws-sdk-go-v2/service/sts v1.18.9/go.mod
h1:yyW88BEPXA2fGFyI2KCcZC3dNpiT0CZAHaF+i656/tQ=
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=
@@ -88,8 +89,8 @@
github.com/containerd/console v1.0.3/go.mod
h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
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.3.3-0.20220203105225-a9a7ef127534
h1:rtAn27wIbmOGUs7RIbVgPEjb31ehTVniDwPGXyMxm5U=
-github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod
h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+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=
@@ -174,8 +175,8 @@
github.com/jtolds/gls v4.20.0+incompatible
h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
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.4
h1:91KN02FnsOYhuunwU4ssRe8lc2JosWmizWa91B5v1PU=
-github.com/klauspost/compress v1.16.4/go.mod
h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/compress v1.16.5
h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI=
+github.com/klauspost/compress v1.16.5/go.mod
h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
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=
@@ -257,8 +258,8 @@
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/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w=
-github.com/rs/zerolog v1.29.0/go.mod
h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
+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=
@@ -269,8 +270,8 @@
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/sirupsen/logrus v1.7.0
h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
github.com/sirupsen/logrus v1.7.0/go.mod
h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0
h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
github.com/skeema/knownhosts v1.1.0
h1:Wvr9V0MxhjRbl3f9nMnKnFfiWTJmtECJ9Njkea3ysW0=
github.com/skeema/knownhosts v1.1.0/go.mod
h1:sKFq3RD6/TKZkSWn8boUbDC7Qkgcv+8XXijpFO6roag=
github.com/smartystreets/assertions v1.0.1
h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w=
@@ -338,8 +339,8 @@
golang.org/x/crypto v0.7.0/go.mod
h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
golang.org/x/crypto v0.8.0/go.mod
h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
-golang.org/x/exp v0.0.0-20230321023759-10a507213a29
h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
-golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod
h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+golang.org/x/exp v0.0.0-20230420155640-133eef4313cb
h1:rhjz/8Mbfa8xROFiH+MQphmAmgqRM0bOMnytznhWEXk=
+golang.org/x/exp v0.0.0-20230420155640-133eef4313cb/go.mod
h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod
h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.33.1/pkg/chezmoi/sourcestate.go
new/chezmoi-2.33.2/pkg/chezmoi/sourcestate.go
--- old/chezmoi-2.33.1/pkg/chezmoi/sourcestate.go 2023-04-08
00:11:28.000000000 +0200
+++ new/chezmoi-2.33.2/pkg/chezmoi/sourcestate.go 2023-04-21
15:42:44.000000000 +0200
@@ -111,6 +111,7 @@
readTemplateData bool
userTemplateData map[string]any
priorityTemplateData map[string]any
+ scriptEnv []string
templateData map[string]any
templateFuncs template.FuncMap
templateOptions []string
@@ -199,6 +200,13 @@
}
}
+// WithScriptEnv sets the script environment variables.
+func WithScriptEnv(scriptEnv []string) SourceStateOption {
+ return func(s *SourceState) {
+ s.scriptEnv = scriptEnv
+ }
+}
+
// WithSourceDir sets the source directory.
func WithSourceDir(sourceDirAbsPath AbsPath) SourceStateOption {
return func(s *SourceState) {
@@ -1038,6 +1046,9 @@
// Generate SourceStateCommands for git-repo externals.
var gitRepoExternalRelPaths RelPaths
for externalRelPath, external := range s.externals {
+ if s.Ignore(externalRelPath) {
+ continue
+ }
if external.Type == ExternalTypeGitRepo {
gitRepoExternalRelPaths =
append(gitRepoExternalRelPaths, externalRelPath)
}
@@ -1673,6 +1684,7 @@
// Run the modifier on the current contents.
cmd := interpreter.ExecCommand(tempFile.Name())
+ cmd.Env = s.scriptEnv
cmd.Stdin = bytes.NewReader(currentContents)
cmd.Stderr = os.Stderr
contents, err = chezmoilog.LogCmdOutput(cmd)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.33.1/pkg/cmd/config.go
new/chezmoi-2.33.2/pkg/cmd/config.go
--- old/chezmoi-2.33.1/pkg/cmd/config.go 2023-04-08 00:11:28.000000000
+0200
+++ new/chezmoi-2.33.2/pkg/cmd/config.go 2023-04-21 15:42:44.000000000
+0200
@@ -233,26 +233,27 @@
}
type templateData struct {
- Arch string `json:"arch"`
- Args []string `json:"args"`
- CacheDir chezmoi.AbsPath `json:"cacheDir"`
- Command string `json:"command"`
- ConfigFile chezmoi.AbsPath `json:"configFile"`
- Executable chezmoi.AbsPath `json:"executable"`
- FQDNHostname string `json:"fqdnHostname"`
- GID string `json:"gid"`
- Group string `json:"group"`
- HomeDir chezmoi.AbsPath `json:"homeDir"`
- Hostname string `json:"hostname"`
- Kernel map[string]any `json:"kernel"`
- OS string `json:"os"`
- OSRelease map[string]any `json:"osRelease"`
- SourceDir chezmoi.AbsPath `json:"sourceDir"`
- UID string `json:"uid"`
- Username string `json:"username"`
- Version map[string]any `json:"version"`
- WindowsVersion map[string]any `json:"windowsVersion"`
- WorkingTree chezmoi.AbsPath `json:"workingTree"`
+ arch string
+ args []string
+ cacheDir chezmoi.AbsPath
+ command string
+ config ConfigFile
+ configFile chezmoi.AbsPath
+ executable chezmoi.AbsPath
+ fqdnHostname string
+ gid string
+ group string
+ homeDir chezmoi.AbsPath
+ hostname string
+ kernel map[string]any
+ os string
+ osRelease map[string]any
+ sourceDir chezmoi.AbsPath
+ uid string
+ username string
+ version map[string]any
+ windowsVersion map[string]any
+ workingTree chezmoi.AbsPath
}
// A configOption sets and option on a Config.
@@ -1275,26 +1276,27 @@
return map[string]any{
"chezmoi": map[string]any{
- "arch": templateData.Arch,
- "args": templateData.Args,
- "cacheDir": templateData.CacheDir.String(),
- "command": templateData.Command,
- "configFile": templateData.ConfigFile.String(),
- "executable": templateData.Executable.String(),
- "fqdnHostname": templateData.FQDNHostname,
- "gid": templateData.GID,
- "group": templateData.Group,
- "homeDir": templateData.HomeDir.String(),
- "hostname": templateData.Hostname,
- "kernel": templateData.Kernel,
- "os": templateData.OS,
- "osRelease": templateData.OSRelease,
- "sourceDir": templateData.SourceDir.String(),
- "uid": templateData.UID,
- "username": templateData.Username,
- "version": templateData.Version,
- "windowsVersion": templateData.WindowsVersion,
- "workingTree": templateData.WorkingTree.String(),
+ "arch": templateData.arch,
+ "args": templateData.args,
+ "cacheDir": templateData.cacheDir.String(),
+ "command": templateData.command,
+ "config": templateData.config,
+ "configFile": templateData.configFile.String(),
+ "executable": templateData.executable.String(),
+ "fqdnHostname": templateData.fqdnHostname,
+ "gid": templateData.gid,
+ "group": templateData.group,
+ "homeDir": templateData.homeDir.String(),
+ "hostname": templateData.hostname,
+ "kernel": templateData.kernel,
+ "os": templateData.os,
+ "osRelease": templateData.osRelease,
+ "sourceDir": templateData.sourceDir.String(),
+ "uid": templateData.uid,
+ "username": templateData.username,
+ "version": templateData.version,
+ "windowsVersion": templateData.windowsVersion,
+ "workingTree": templateData.workingTree.String(),
},
}
}
@@ -1537,6 +1539,7 @@
chezmoi.WithLogger(&sourceStateLogger),
chezmoi.WithMode(c.Mode),
chezmoi.WithPriorityTemplateData(c.Data),
+ chezmoi.WithScriptEnv(c.runEnv),
chezmoi.WithSourceDir(c.SourceDirAbsPath),
chezmoi.WithSystem(c.sourceSystem),
chezmoi.WithTemplateFuncs(c.templateFuncs),
@@ -1903,22 +1906,22 @@
templateData := c.getTemplateData(cmd)
scriptEnv = append(scriptEnv, "CHEZMOI=1")
for key, value := range map[string]string{
- "ARCH": templateData.Arch,
- "ARGS": strings.Join(templateData.Args, " "),
- "CACHE_DIR": templateData.CacheDir.String(),
- "COMMAND": templateData.Command,
- "CONFIG_FILE": templateData.ConfigFile.String(),
- "EXECUTABLE": templateData.Executable.String(),
- "FQDN_HOSTNAME": templateData.FQDNHostname,
- "GID": templateData.GID,
- "GROUP": templateData.Group,
- "HOME_DIR": templateData.HomeDir.String(),
- "HOSTNAME": templateData.Hostname,
- "OS": templateData.OS,
- "SOURCE_DIR": templateData.SourceDir.String(),
- "UID": templateData.UID,
- "USERNAME": templateData.Username,
- "WORKING_TREE": templateData.WorkingTree.String(),
+ "ARCH": templateData.arch,
+ "ARGS": strings.Join(templateData.args, " "),
+ "CACHE_DIR": templateData.cacheDir.String(),
+ "COMMAND": templateData.command,
+ "CONFIG_FILE": templateData.configFile.String(),
+ "EXECUTABLE": templateData.executable.String(),
+ "FQDN_HOSTNAME": templateData.fqdnHostname,
+ "GID": templateData.gid,
+ "GROUP": templateData.group,
+ "HOME_DIR": templateData.homeDir.String(),
+ "HOSTNAME": templateData.hostname,
+ "OS": templateData.os,
+ "SOURCE_DIR": templateData.sourceDir.String(),
+ "UID": templateData.uid,
+ "USERNAME": templateData.username,
+ "WORKING_TREE": templateData.workingTree.String(),
} {
scriptEnv = append(scriptEnv, "CHEZMOI_"+key+"="+value)
}
@@ -1926,10 +1929,10 @@
scriptEnv = append(scriptEnv, "CHEZMOI_VERBOSE=1")
}
for groupKey, group := range map[string]map[string]any{
- "KERNEL": templateData.Kernel,
- "OS_RELEASE": templateData.OSRelease,
- "VERSION": templateData.Version,
- "WINDOWS_VERSION": templateData.WindowsVersion,
+ "KERNEL": templateData.kernel,
+ "OS_RELEASE": templateData.osRelease,
+ "VERSION": templateData.version,
+ "WINDOWS_VERSION": templateData.windowsVersion,
} {
for key, value := range group {
upperSnakeCaseKey := camelCaseToUpperSnakeCase(key)
@@ -2077,31 +2080,32 @@
sourceDirAbsPath, _ := c.getSourceDirAbsPath(nil)
return &templateData{
- Arch: runtime.GOARCH,
- Args: os.Args,
- CacheDir: c.CacheDirAbsPath,
- Command: cmd.Name(),
- ConfigFile: c.configFileAbsPath,
- Executable: chezmoi.NewAbsPath(executable),
- FQDNHostname: fqdnHostname,
- GID: gid,
- Group: group,
- HomeDir: c.homeDirAbsPath,
- Hostname: hostname,
- Kernel: kernel,
- OS: runtime.GOOS,
- OSRelease: osRelease,
- SourceDir: sourceDirAbsPath,
- UID: uid,
- Username: username,
- Version: map[string]any{
+ arch: runtime.GOARCH,
+ args: os.Args,
+ cacheDir: c.CacheDirAbsPath,
+ command: cmd.Name(),
+ config: c.ConfigFile,
+ configFile: c.configFileAbsPath,
+ executable: chezmoi.NewAbsPath(executable),
+ fqdnHostname: fqdnHostname,
+ gid: gid,
+ group: group,
+ homeDir: c.homeDirAbsPath,
+ hostname: hostname,
+ kernel: kernel,
+ os: runtime.GOOS,
+ osRelease: osRelease,
+ sourceDir: sourceDirAbsPath,
+ uid: uid,
+ username: username,
+ version: map[string]any{
"builtBy": c.versionInfo.BuiltBy,
"commit": c.versionInfo.Commit,
"date": c.versionInfo.Date,
"version": c.versionInfo.Version,
},
- WindowsVersion: windowsVersion,
- WorkingTree: c.WorkingTreeAbsPath,
+ windowsVersion: windowsVersion,
+ workingTree: c.WorkingTreeAbsPath,
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.33.1/pkg/cmd/testdata/scripts/issue2865.txtar
new/chezmoi-2.33.2/pkg/cmd/testdata/scripts/issue2865.txtar
--- old/chezmoi-2.33.1/pkg/cmd/testdata/scripts/issue2865.txtar 1970-01-01
01:00:00.000000000 +0100
+++ new/chezmoi-2.33.2/pkg/cmd/testdata/scripts/issue2865.txtar 2023-04-21
15:42:44.000000000 +0200
@@ -0,0 +1,16 @@
+[windows] skip 'UNIX only'
+
+# test that .chezmoi.sourceDir is set correctly when .chezmoiroot is present
+exec chezmoi execute-template '{{ .chezmoi.sourceDir }}'
+stdout ${CHEZMOISOURCEDIR@R}/home
+
+# test that .chezmoi.sourceDir is set correctly in chezmoi apply
+exec chezmoi apply
+stdout ${CHEZMOISOURCEDIR@R}/home
+
+-- home/user/.local/share/chezmoi/.chezmoiroot --
+home
+-- home/user/.local/share/chezmoi/home/.chezmoiscripts/run_once_echo.sh.tmpl --
+#!/bin/sh
+
+echo {{ .chezmoi.sourceDir }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.33.1/pkg/cmd/testdata/scripts/issue2934.txtar
new/chezmoi-2.33.2/pkg/cmd/testdata/scripts/issue2934.txtar
--- old/chezmoi-2.33.1/pkg/cmd/testdata/scripts/issue2934.txtar 1970-01-01
01:00:00.000000000 +0100
+++ new/chezmoi-2.33.2/pkg/cmd/testdata/scripts/issue2934.txtar 2023-04-21
15:42:44.000000000 +0200
@@ -0,0 +1,10 @@
+[windows] skip
+
+# test that chezmoi sets environment variables for modify_ scripts
+exec chezmoi apply
+grep ^${CHEZMOISOURCEDIR@R}$ $HOME/.modify
+
+-- home/user/.local/share/chezmoi/modify_dot_modify --
+#!/bin/sh
+
+echo ${CHEZMOI_SOURCE_DIR}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.33.1/pkg/cmd/testdata/scripts/issue2937.txtar
new/chezmoi-2.33.2/pkg/cmd/testdata/scripts/issue2937.txtar
--- old/chezmoi-2.33.1/pkg/cmd/testdata/scripts/issue2937.txtar 1970-01-01
01:00:00.000000000 +0100
+++ new/chezmoi-2.33.2/pkg/cmd/testdata/scripts/issue2937.txtar 2023-04-21
15:42:44.000000000 +0200
@@ -0,0 +1,24 @@
+# test that .chezmoiignore prevents git-repo externals from being downloaded
+exec chezmoi apply
+! exists .dir
+
+chhome home2/user
+
+# test that .chezmoiignore prevents external archives from being downloaded
+exec chezmoi apply
+! exists .dir
+
+-- home/user/.local/share/chezmoi/.chezmoiexternal.toml --
+[".dir"]
+ type = "archive"
+ url = "https://example.com/does-not-exist.tar.gz";
+-- home/user/.local/share/chezmoi/.chezmoiignore --
+.dir
+.dir/**
+-- home2/user/.local/share/chezmoi/.chezmoiexternal.toml --
+[".dir"]
+ type = "git-repo"
+ url = "https://example.com/user/repo.git";
+-- home2/user/.local/share/chezmoi/.chezmoiignore --
+.dir
+.dir/**
++++++ chezmoi.obsinfo ++++++
--- /var/tmp/diff_new_pack.qsu2hb/_old 2023-04-21 20:17:21.638430793 +0200
+++ /var/tmp/diff_new_pack.qsu2hb/_new 2023-04-21 20:17:21.642430815 +0200
@@ -1,5 +1,5 @@
name: chezmoi
-version: 2.33.1
-mtime: 1680905488
-commit: bc4478d84f59ea38084cf7e58b9226278d0e046d
+version: 2.33.2
+mtime: 1682084564
+commit: ebc536f0dbf7c54ab8677b202532736be8d61c6c
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/chezmoi/vendor.tar.gz
/work/SRC/openSUSE:Factory/.chezmoi.new.1533/vendor.tar.gz differ: char 5, line
1
