diff options
author | 2023-10-25 22:37:31 -0300 | |
---|---|---|
committer | 2023-10-27 16:40:39 -0300 | |
commit | 98e34c444bcf5f826aa7bea9a50acbb475b88f8c (patch) | |
tree | 2cd861e0fe923723c57ae3387d6b3d7a3894e3a4 /contrib | |
parent | sort.py: fix missing/duplicated commands in usage (diff) | |
download | firejail-98e34c444bcf5f826aa7bea9a50acbb475b88f8c.tar.gz firejail-98e34c444bcf5f826aa7bea9a50acbb475b88f8c.tar.zst firejail-98e34c444bcf5f826aa7bea9a50acbb475b88f8c.zip |
build: sort.py: use case-sensitive sorting
To match how things are sorted elsewhere, such as with `noblacklist` /
`whitelist` lines (vertically) in profiles and in
ci/check/profiles/sort-disable-programs.sh and src/etc-cleanup/main.c.
This makes the order in `private-etc` always be groups (`@group`), then
uppercase paths, then lowercase paths. Example from
etc/profile-m-z/softmaker-common.profile:
private-etc @tls-ca,SoftMaker,fstab
Note that this does not affect a significant amount of profiles; most
changes are in `private-bin` / `private-lib` lines and in `private-etc`
lines for newer profiles that do not use groups. This is partly due to
commit 5d0822c52 ("private-etc: big profile changes", 2023-02-05)
replacing `X11` with `@x11` in `private-etc` lines and then commit
0f996ea4d ("private-etc: groups modified", 2023-02-05) removing
`Trolltech.conf` from `private-etc` lines and using case-sensitive
sorting in them.
Relates to #5610.
Diffstat (limited to 'contrib')
-rwxr-xr-x | contrib/sort.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/sort.py b/contrib/sort.py index 026384e1a..a827e20ba 100755 --- a/contrib/sort.py +++ b/contrib/sort.py | |||
@@ -38,7 +38,7 @@ Exit Codes: | |||
38 | 38 | ||
39 | def sort_alphabetical(original_items): | 39 | def sort_alphabetical(original_items): |
40 | items = original_items.split(",") | 40 | items = original_items.split(",") |
41 | items.sort(key=str.casefold) | 41 | items.sort() |
42 | return ",".join(items) | 42 | return ",".join(items) |
43 | 43 | ||
44 | 44 | ||