mirror of
https://github.com/netblue30/firejail.git
synced 2026-05-15 06:06:02 -06:00
build: use ASCII sort on firecfg and check for duplicates
Currently the CI check does not consider certain special characters (such as `-`) when sorting due to `sort -d`. So remove `-d`, sort firecfg using `LC_ALL=C` and enforce that order. Also add `sort -u` to check for duplicates. This also allows the CI check to ignore normal comments (lines starting with `# `) anywhere in the file. Relates to #4643.
This commit is contained in:
parent
30f9ad908e
commit
ac2bd3211d
2 changed files with 19 additions and 14 deletions
|
|
@ -1,2 +1,5 @@
|
|||
#!/bin/sh
|
||||
tail -n +4 "$1" | sed 's/^# /#/' | LC_ALL=C sort -c -d
|
||||
# See ../../../src/firecfg/firecfg.config
|
||||
|
||||
sed -E -e '/^#$/d' -e '/^# /d' -e 's/^#([^ ])/\1/' "$1" |
|
||||
LC_ALL=C sort -c -u
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
# /etc/firejail/firecfg.config - firecfg utility configuration file
|
||||
# This is the list of programs in alphabetical order handled by firecfg utility
|
||||
#
|
||||
# Note: Normal comment lines should start with `# ` and commented code lines
|
||||
# should start with just `#` (no spaces).
|
||||
0ad
|
||||
1password
|
||||
2048-qt
|
||||
|
|
@ -149,8 +151,8 @@ clamdscan
|
|||
clamdtop
|
||||
clamscan
|
||||
clamtk
|
||||
clawsker
|
||||
claws-mail
|
||||
clawsker
|
||||
clementine
|
||||
clion
|
||||
clion-eap
|
||||
|
|
@ -182,6 +184,7 @@ crow
|
|||
cryptocat
|
||||
cvlc
|
||||
cyberfox
|
||||
d-feet
|
||||
daisy
|
||||
darktable
|
||||
dconf-editor
|
||||
|
|
@ -192,7 +195,6 @@ deluge
|
|||
desktopeditors
|
||||
devhelp
|
||||
dex2jar
|
||||
d-feet
|
||||
dia
|
||||
dig
|
||||
digikam
|
||||
|
|
@ -271,8 +273,8 @@ flacsplt
|
|||
flameshot
|
||||
flashpeak-slimjet
|
||||
flowblade
|
||||
fontforge
|
||||
font-manager
|
||||
fontforge
|
||||
fossamail
|
||||
four-in-a-row
|
||||
fractal
|
||||
|
|
@ -384,12 +386,12 @@ gradio
|
|||
gramps
|
||||
gravity-beams-and-evaporating-stars
|
||||
gthumb
|
||||
gtk2-youtube-viewer
|
||||
gtk3-youtube-viewer
|
||||
gtk-lbry-viewer
|
||||
gtk-pipe-viewer
|
||||
gtk-straw-viewer
|
||||
gtk-youtube-viewer
|
||||
gtk2-youtube-viewer
|
||||
gtk3-youtube-viewer
|
||||
guayadeque
|
||||
gucharmap
|
||||
gummi
|
||||
|
|
@ -410,8 +412,8 @@ icecat
|
|||
icedove
|
||||
iceweasel
|
||||
idea
|
||||
ideaIC
|
||||
idea.sh
|
||||
ideaIC
|
||||
imagej
|
||||
img2txt
|
||||
impressive
|
||||
|
|
@ -559,7 +561,6 @@ mp3wrap
|
|||
mpDris2
|
||||
mpg123
|
||||
mpg123-alsa
|
||||
mpg123.bin
|
||||
mpg123-id3dump
|
||||
mpg123-jack
|
||||
mpg123-nas
|
||||
|
|
@ -568,6 +569,7 @@ mpg123-oss
|
|||
mpg123-portaudio
|
||||
mpg123-pulse
|
||||
mpg123-strip
|
||||
mpg123.bin
|
||||
mplayer
|
||||
mpsyt
|
||||
mpv
|
||||
|
|
@ -636,11 +638,11 @@ onionshare-cli
|
|||
onionshare-gui
|
||||
ooffice
|
||||
ooviewdoc
|
||||
open-invaders
|
||||
openarena
|
||||
openarena_ded
|
||||
opencity
|
||||
openclonk
|
||||
open-invaders
|
||||
openmw
|
||||
openmw-launcher
|
||||
openoffice.org
|
||||
|
|
@ -780,8 +782,8 @@ sniffnet
|
|||
snox
|
||||
soffice
|
||||
sol
|
||||
soundconverter
|
||||
sound-juicer
|
||||
soundconverter
|
||||
spectacle
|
||||
spectral
|
||||
spotify
|
||||
|
|
@ -794,8 +796,8 @@ steam
|
|||
steam-native
|
||||
steam-runtime
|
||||
stellarium
|
||||
strawberry
|
||||
straw-viewer
|
||||
strawberry
|
||||
strings
|
||||
studio.sh
|
||||
subdownloader
|
||||
|
|
@ -826,7 +828,6 @@ thunderbird-beta
|
|||
thunderbird-wayland
|
||||
tilp
|
||||
tor-browser
|
||||
torbrowser
|
||||
tor-browser-ar
|
||||
tor-browser-ca
|
||||
tor-browser-cs
|
||||
|
|
@ -848,7 +849,6 @@ tor-browser-it
|
|||
tor-browser-ja
|
||||
tor-browser-ka
|
||||
tor-browser-ko
|
||||
torbrowser-launcher
|
||||
tor-browser-nb
|
||||
tor-browser-nl
|
||||
tor-browser-pl
|
||||
|
|
@ -859,6 +859,8 @@ tor-browser-tr
|
|||
tor-browser-vi
|
||||
tor-browser-zh-cn
|
||||
tor-browser-zh-tw
|
||||
torbrowser
|
||||
torbrowser-launcher
|
||||
torcs
|
||||
totem
|
||||
tracker
|
||||
|
|
@ -968,8 +970,8 @@ yelp
|
|||
youtube
|
||||
youtube-dl
|
||||
youtube-dl-gui
|
||||
youtubemusic-nativefier
|
||||
youtube-viewer
|
||||
youtubemusic-nativefier
|
||||
yt-dlp
|
||||
ytmdesktop
|
||||
zaproxy
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue