Fix changing user/group for created files in prepare/build steps

Eeems · Eeems · commit 8732528efaae · 2025-10-28T21:27:45.000-06:00
diff --git a/toltec/builder.py b/toltec/builder.py
@@ -287,7 +287,8 @@ def _prepare(self, recipe: Recipe, src_dir: str) -> None:
             script="\n".join(
                 [
                     recipe.prepare,
-                    f'chown -R {uid}:{gid} "{mount_src}"',
+                    f"find {mount_src} {repo_src} -group $(id -g) -exec chgrp {gid} {{}} +",
+                    f"find {mount_src} {repo_src} -group $(id -u) -exec chown {uid} {{}} +",
                 ]
             ),
         )
@@ -407,7 +408,8 @@ def _build(self, recipe: Recipe, src_dir: str) -> None:
                     *pre_script,
                     f'cd "{mount_src}"',
                     recipe.build,
-                    f'chown -R {uid}:{gid} "{mount_src}"',
+                    f"find {mount_src} {repo_src} -group $(id -g) -exec chgrp {gid} {{}} +",
+                    f"find {mount_src} {repo_src} -group $(id -u) -exec chown {uid} {{}} +",
                 )
             ),
         )

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,8 @@ def _prepare(self, recipe: Recipe, src_dir: str) -> None:`
`287`	`287`	`script="\n".join(`
`288`	`288`	`[`
`289`	`289`	`recipe.prepare,`
`290`		`- f'chown -R {uid}:{gid} "{mount_src}"',`
	`290`	`+ f"find {mount_src} {repo_src} -group $(id -g) -exec chgrp {gid} {{}} +",`
	`291`	`+ f"find {mount_src} {repo_src} -group $(id -u) -exec chown {uid} {{}} +",`
`291`	`292`	`]`
`292`	`293`	`),`
`293`	`294`	`)`
`@@ -407,7 +408,8 @@ def _build(self, recipe: Recipe, src_dir: str) -> None:`
`407`	`408`	`*pre_script,`
`408`	`409`	`f'cd "{mount_src}"',`
`409`	`410`	`recipe.build,`
`410`		`- f'chown -R {uid}:{gid} "{mount_src}"',`
	`411`	`+ f"find {mount_src} {repo_src} -group $(id -g) -exec chgrp {gid} {{}} +",`
	`412`	`+ f"find {mount_src} {repo_src} -group $(id -u) -exec chown {uid} {{}} +",`
`411`	`413`	`)`
`412`	`414`	`),`
`413`	`415`	`)`