From f6d27ebac64bf2fa6eae4e710f08bac261636a7b Mon Sep 17 00:00:00 2001 From: Joonas Loppi <joonas+code@joonas.fi> Date: Thu, 18 Apr 2024 21:19:35 +0300 Subject: [PATCH 1/2] make sure `TZ` gets passed (support setting local timezone) --- cmd/screen-server/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/screen-server/main.go b/cmd/screen-server/main.go index c753a78..afddc5e 100644 --- a/cmd/screen-server/main.go +++ b/cmd/screen-server/main.go @@ -281,8 +281,8 @@ func runOneScreen( openbox := exec.CommandContext(ctx, "openbox") openbox.SysProcAttr = runAsUserAndGroup openbox.Env = append( - openbox.Env, - "HOME="+screen.Homedir(), + os.Environ(), // make sure possible TZ gets passed + "HOME="+screen.Homedir(), // override HOME=/root "DISPLAY="+screen.XScreenNumberWithColon(), "USER="+screen.Username()) From 4092bd7a08e20424cddce7d83e5e42d514723b7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 18:19:56 +0000 Subject: [PATCH 2/2] Bump golang.org/x/sys from 0.0.0-20201101102859-da207088b7d1 to 0.1.0 Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.0.0-20201101102859-da207088b7d1 to 0.1.0. - [Commits](https://github.com/golang/sys/commits/v0.1.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> --- go.mod | 2 +- go.sum | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 1a9d99a..50d5cdb 100644 --- a/go.mod +++ b/go.mod @@ -19,5 +19,5 @@ require ( github.com/pkg/xattr v0.4.4 // indirect github.com/spf13/pflag v1.0.5 // indirect golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect - golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 // indirect + golang.org/x/sys v0.1.0 // indirect ) diff --git a/go.sum b/go.sum index 84b4752..d02f958 100644 --- a/go.sum +++ b/go.sum @@ -110,8 +110,9 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200121082415-34d275377bf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck= golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=