Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/calm-windows-owner.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ftw": patch
---

Build the updater on Windows while preserving Compose file ownership on Unix.
9 changes: 9 additions & 0 deletions go/cmd/ftw-updater/file_owner_other.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
//go:build !unix

package main

import "os"

// Non-Unix systems have no portable numeric owner to copy. The staged file
// keeps the owner and access rules assigned by the platform.
func preserveFileOwner(_ *os.File, _ os.FileInfo) error { return nil }
16 changes: 16 additions & 0 deletions go/cmd/ftw-updater/file_owner_unix.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//go:build unix

package main

import (
"os"
"syscall"
)

func preserveFileOwner(file *os.File, info os.FileInfo) error {
stat, ok := info.Sys().(*syscall.Stat_t)
if !ok {
return nil
}
return file.Chown(int(stat.Uid), int(stat.Gid))
}
7 changes: 2 additions & 5 deletions go/cmd/ftw-updater/retire_python.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"os/exec"
"path/filepath"
"strings"
"syscall"
"time"

"gopkg.in/yaml.v3"
Expand Down Expand Up @@ -327,10 +326,8 @@ func replaceRetiredCompose(path string, data []byte) error {
}
defer os.Remove(f.Name())
defer f.Close()
if stat, ok := st.Sys().(*syscall.Stat_t); ok {
if err = f.Chown(int(stat.Uid), int(stat.Gid)); err != nil {
return err
}
if err = preserveFileOwner(f, st); err != nil {
return err
}
if err = f.Chmod(st.Mode().Perm()); err != nil {
return err
Expand Down