From 98e34c444bcf5f826aa7bea9a50acbb475b88f8c Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Wed, 25 Oct 2023 22:37:31 -0300 Subject: 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. --- etc/profile-a-l/ani-cli.profile | 2 +- etc/profile-a-l/discord-canary.profile | 2 +- etc/profile-a-l/discord-ptb.profile | 2 +- etc/profile-a-l/discord.profile | 2 +- etc/profile-a-l/display.profile | 2 +- etc/profile-a-l/enpass.profile | 2 +- etc/profile-a-l/fbreader.profile | 2 +- etc/profile-a-l/fluffychat.profile | 2 +- etc/profile-a-l/hugin.profile | 2 +- etc/profile-a-l/lobster.profile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'etc/profile-a-l') diff --git a/etc/profile-a-l/ani-cli.profile b/etc/profile-a-l/ani-cli.profile index afd76282c..76db2986d 100644 --- a/etc/profile-a-l/ani-cli.profile +++ b/etc/profile-a-l/ani-cli.profile @@ -33,7 +33,7 @@ notv disable-mnt private-bin ani-cli,aria2c,cat,cp,curl,cut,ffmpeg,fzf,grep,head,mkdir,mktemp,mv,nl,nohup,patch,printf,rm,rofi,sed,sh,sort,tail,tput,tr,uname,wc #private-cache -private-etc alsa,alternatives,asound.conf,ca-certificates,crypto-policies,fonts,host.conf,hostname,hosts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,locale,locale.alias,locale.conf,localtime,machine-id,mime.types,nsswitch.conf,pango,pki,protocols,pulse,resolv.conf,rpc,services,ssl,X11,xdg +private-etc X11,alsa,alternatives,asound.conf,ca-certificates,crypto-policies,fonts,host.conf,hostname,hosts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,locale,locale.alias,locale.conf,localtime,machine-id,mime.types,nsswitch.conf,pango,pki,protocols,pulse,resolv.conf,rpc,services,ssl,xdg private-tmp # Redirect diff --git a/etc/profile-a-l/discord-canary.profile b/etc/profile-a-l/discord-canary.profile index b67729301..acf0281d9 100644 --- a/etc/profile-a-l/discord-canary.profile +++ b/etc/profile-a-l/discord-canary.profile @@ -12,7 +12,7 @@ whitelist ${HOME}/.config/discordcanary whitelist /opt/DiscordCanary whitelist /opt/discord-canary -private-bin discord-canary,DiscordCanary +private-bin DiscordCanary,discord-canary # Redirect include discord-common.profile diff --git a/etc/profile-a-l/discord-ptb.profile b/etc/profile-a-l/discord-ptb.profile index a657c52b5..82b33174c 100644 --- a/etc/profile-a-l/discord-ptb.profile +++ b/etc/profile-a-l/discord-ptb.profile @@ -12,7 +12,7 @@ whitelist ${HOME}/.config/discordptb whitelist /opt/DiscordPTB whitelist /opt/discord -private-bin discord-ptb,DiscordPTB +private-bin DiscordPTB,discord-ptb # Redirect include discord-common.profile diff --git a/etc/profile-a-l/discord.profile b/etc/profile-a-l/discord.profile index a4fcae5b8..d52683658 100644 --- a/etc/profile-a-l/discord.profile +++ b/etc/profile-a-l/discord.profile @@ -12,7 +12,7 @@ whitelist ${HOME}/.config/discord whitelist /opt/Discord whitelist /opt/discord -private-bin discord,Discord +private-bin Discord,discord # Redirect include discord-common.profile diff --git a/etc/profile-a-l/display.profile b/etc/profile-a-l/display.profile index 40e19dfc3..53ed90e9c 100644 --- a/etc/profile-a-l/display.profile +++ b/etc/profile-a-l/display.profile @@ -40,7 +40,7 @@ private-bin display,python* private-dev # On Debian-based systems, display is a symlink in /etc/alternatives private-etc ImageMagick-6,ImageMagick-7 -private-lib gcc/*/*/libgcc_s.so.*,gcc/*/*/libgomp.so.*,ImageMagick*,libfreetype.so.*,libltdl.so.*,libMagickWand-*.so.*,libXext.so.* +private-lib ImageMagick*,gcc/*/*/libgcc_s.so.*,gcc/*/*/libgomp.so.*,libMagickWand-*.so.*,libXext.so.*,libfreetype.so.*,libltdl.so.* private-tmp dbus-user none diff --git a/etc/profile-a-l/enpass.profile b/etc/profile-a-l/enpass.profile index 93929c6ea..62e9d42ac 100644 --- a/etc/profile-a-l/enpass.profile +++ b/etc/profile-a-l/enpass.profile @@ -52,7 +52,7 @@ protocol unix,inet,inet6,netlink seccomp tracelog -private-bin dirname,Enpass,importer_enpass,readlink,sh +private-bin Enpass,dirname,importer_enpass,readlink,sh ?HAS_APPIMAGE: ignore private-dev private-dev private-opt Enpass diff --git a/etc/profile-a-l/fbreader.profile b/etc/profile-a-l/fbreader.profile index 434371aee..5906085de 100644 --- a/etc/profile-a-l/fbreader.profile +++ b/etc/profile-a-l/fbreader.profile @@ -33,7 +33,7 @@ novideo protocol unix,inet,inet6 seccomp -private-bin fbreader,FBReader +private-bin FBReader,fbreader private-dev private-tmp diff --git a/etc/profile-a-l/fluffychat.profile b/etc/profile-a-l/fluffychat.profile index abc5979da..1c5db09e9 100644 --- a/etc/profile-a-l/fluffychat.profile +++ b/etc/profile-a-l/fluffychat.profile @@ -60,7 +60,7 @@ disable-mnt private-bin firefox,fluffychat,sh,which,zenity private-cache private-dev -private-etc alsa,alternatives,asound.conf,ca-certificates,crypto-policies,dconf,fonts,gconf,gtk-3.0,host.conf,hostname,hosts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,locale,locale.alias,locale.conf,localtime,machine-id,mime.types,nsswitch.conf,pango,pki,protocols,pulse,resolv.conf,rpc,services,ssl,X11,xdg +private-etc X11,alsa,alternatives,asound.conf,ca-certificates,crypto-policies,dconf,fonts,gconf,gtk-3.0,host.conf,hostname,hosts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,locale,locale.alias,locale.conf,localtime,machine-id,mime.types,nsswitch.conf,pango,pki,protocols,pulse,resolv.conf,rpc,services,ssl,xdg private-tmp dbus-user filter diff --git a/etc/profile-a-l/hugin.profile b/etc/profile-a-l/hugin.profile index c4085cf9c..683e1b5f7 100644 --- a/etc/profile-a-l/hugin.profile +++ b/etc/profile-a-l/hugin.profile @@ -38,7 +38,7 @@ novideo protocol unix seccomp -private-bin align_image_stack,autooptimiser,calibrate_lens_gui,celeste_standalone,checkpto,cpclean,cpfind,deghosting_mask,enblend,exiftool,fulla,geocpset,hugin,hugin_executor,hugin_hdrmerge,hugin_lensdb,hugin_stitch_project,icpfind,linefind,nona,pano_modify,pano_trafo,perl,PTBatcherGUI,pto_gen,pto_lensstack,pto_mask,pto_merge,pto_move,pto_template,pto_var,sh,tca_correct,uname,verdandi,vig_optimize +private-bin PTBatcherGUI,align_image_stack,autooptimiser,calibrate_lens_gui,celeste_standalone,checkpto,cpclean,cpfind,deghosting_mask,enblend,exiftool,fulla,geocpset,hugin,hugin_executor,hugin_hdrmerge,hugin_lensdb,hugin_stitch_project,icpfind,linefind,nona,pano_modify,pano_trafo,perl,pto_gen,pto_lensstack,pto_mask,pto_merge,pto_move,pto_template,pto_var,sh,tca_correct,uname,verdandi,vig_optimize private-cache private-dev private-tmp diff --git a/etc/profile-a-l/lobster.profile b/etc/profile-a-l/lobster.profile index f9dc4f60c..367f69743 100644 --- a/etc/profile-a-l/lobster.profile +++ b/etc/profile-a-l/lobster.profile @@ -44,7 +44,7 @@ notv disable-mnt private-bin base64,bash,cat,command,curl,cut,date,dirname,echo,ffmpeg,ffprobe,find,fzf,grep,head,hxunent,ln,lobster,ls,mkdir,mkfifo,nano,nohup,openssl,patch,pgrep,ps,rm,rofi,sed,sh,sleep,socat,tail,tee,tput,tr,ueberzugpp,uname,uuidgen,vim,wc #private-cache -private-etc alsa,alternatives,asound.conf,ca-certificates,crypto-policies,fonts,host.conf,hostname,hosts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,locale,locale.alias,locale.conf,localtime,machine-id,mime.types,nsswitch.conf,pango,pki,protocols,pulse,resolv.conf,rpc,services,ssl,X11,xdg +private-etc X11,alsa,alternatives,asound.conf,ca-certificates,crypto-policies,fonts,host.conf,hostname,hosts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,locale,locale.alias,locale.conf,localtime,machine-id,mime.types,nsswitch.conf,pango,pki,protocols,pulse,resolv.conf,rpc,services,ssl,xdg private-tmp # Redirect -- cgit v1.2.3-70-g09d2