From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Cc: Demi Marie Obenour <demiobenour@gmail.com>
Subject: [PATCH 1/2] scripts/make-erofs.sh: run chmod less
Date: Tue, 30 Sep 2025 11:19:09 +0200 [thread overview]
Message-ID: <20250930092249.571803-2-hi@alyssa.is> (raw)
In-Reply-To: <20250930092249.571803-1-hi@alyssa.is>
The common case here is that we don't have to change any permissions,
so rewrite it so that (assuming [ is a shell builtin) we don't need to
run any additional programs unless we actually need to make a
permissions change.
I also find this a bit more readable than the previous awk version,
and we no longer need to ignore errors from chmod.
Link: https://spectrum-os.org/lists/archives/spectrum-devel/87plbj4w9q.fsf@alyssa.is
Signed-off-by: Alyssa Ross <hi@alyssa.is>
---
scripts/make-erofs.sh | 33 +++++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/scripts/make-erofs.sh b/scripts/make-erofs.sh
index be65de8..551ae4a 100755
--- a/scripts/make-erofs.sh
+++ b/scripts/make-erofs.sh
@@ -1,6 +1,6 @@
#!/bin/sh -eu
#
-# SPDX-FileCopyrightText: 2023-2024 Alyssa Ross <hi@alyssa.is>
+# SPDX-FileCopyrightText: 2023-2025 Alyssa Ross <hi@alyssa.is>
# SPDX-FileCopyrightText: 2025 Demi Marie Obenour <demiobenour@gmail.com>
# SPDX-License-Identifier: EUPL-1.2+
#
@@ -39,15 +39,28 @@ while read -r arg1; do
(*) parent=.;;
esac
- awk -v parent="$parent" -v root="$root" 'BEGIN {
- n = split(parent, components, "/")
- for (i = 1; i <= n; i++) {
- printf "%s/", root
- for (j = 1; j <= i; j++)
- printf "%s/", components[j]
- print
- }
- }' | xargs -rd '\n' chmod +w -- 2>/dev/null || :
+ # Ensure any existing directories we want to write into are writable.
+ (
+ set --
+ while :; do
+ abs="$root/$parent"
+ if [ -e "$abs" ] && ! [ -w "$abs" ]; then
+ set -- "$abs" "$@"
+ fi
+
+ # shellcheck disable=SC2030 # shadowed on purpose
+ case "$parent" in
+ */*) parent="${parent%/*}" ;;
+ *) break ;;
+ esac
+ done
+
+ if [ "$#" -ne 0 ]; then
+ chmod +w -- "$@"
+ fi
+ )
+
+ # shellcheck disable=SC2031 # shadowed in subshell on purpose
mkdir -p -- "$root/$parent"
cp -RT -- "$arg1" "$root/$arg2"
--
2.51.0
next prev parent reply other threads:[~2025-09-30 9:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-30 9:19 [PATCH 0/2] scripts/make-erofs.sh: run mkdir/chmod less Alyssa Ross
2025-09-30 9:19 ` Alyssa Ross [this message]
2025-09-30 16:00 ` [PATCH 1/2] scripts/make-erofs.sh: run chmod less Demi Marie Obenour
2025-09-30 19:46 ` Alyssa Ross
2025-09-30 9:19 ` [PATCH 2/2] scripts/make-erofs.sh: run mkdir less Alyssa Ross
2025-09-30 16:01 ` Demi Marie Obenour
2025-09-30 19:46 ` Alyssa Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250930092249.571803-2-hi@alyssa.is \
--to=hi@alyssa.is \
--cc=demiobenour@gmail.com \
--cc=devel@spectrum-os.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).