diff options
author | 2023-08-11 05:26:05 -0300 | |
---|---|---|
committer | 2023-09-08 04:57:37 -0300 | |
commit | c6d33375cc34e4e5e527ab43c219adfbc8848c62 (patch) | |
tree | 0ccf4359f9b8ab8a5c4e37bd042fbf19314f12a8 /etc/profile-a-l/falkon.profile | |
parent | profiles: fix some comments (diff) | |
download | firejail-c6d33375cc34e4e5e527ab43c219adfbc8848c62.tar.gz firejail-c6d33375cc34e4e5e527ab43c219adfbc8848c62.tar.zst firejail-c6d33375cc34e4e5e527ab43c219adfbc8848c62.zip |
profiles: fix commented code and eol comments
Main changes:
* Remove the space after `#` for commented code lines to distinguish
them from normal comments
* Use `#` instead of `-` for comments at the end of the line so that
commented code lines work after being uncommented
Commands used to search and replace:
arg0="$(cat contrib/syntax/lists/profile_commands_arg0.list |
LC_ALL=C sort -u | tr '\n' '|' | sed -e 's/|$//' -e 's/\./\\./g')"
arg1="$(cat contrib/syntax/lists/profile_commands_arg1.list |
LC_ALL=C sort -u | tr '\n' '|' | sed -e 's/|$//' -e 's/\./\\./g')"
git ls-files -z -- etc/inc etc/profile* | xargs -0 -I '{}' \
sh -c "printf '%s\n' \"\$(sed -E \
-e 's/^# ($arg0)( [#-]-? .*)?\$/#\\1\\2/' \
-e 's/^# ($arg1)( [^ ]*)?( [#-]-? .*)?\$/#\\1\\2\\3/' \
-e 's/^# (whitelist \\$)/#\\1/' \
-e 's/^(#[^ ].+) --? /\\1 # /' \
'{}')\" >'{}'"
Commands used to check for leftover entries:
arg0="$(cat contrib/syntax/lists/profile_commands_arg0.list |
LC_ALL=C sort -u | tr '\n' '|' | sed -e 's/|$//' -e 's/\./\\./g')"
arg1="$(cat contrib/syntax/lists/profile_commands_arg1.list |
LC_ALL=C sort -u | tr '\n' '|' | sed -e 's/|$//' -e 's/\./\\./g')"
git grep -E "^# ($arg0|$arg1)( +|$)" -- etc/inc etc/profile*
See also commit 30f9ad908 ("build: improve comments in firecfg.config",
2023-08-05) / PR #5942.
Diffstat (limited to 'etc/profile-a-l/falkon.profile')
-rw-r--r-- | etc/profile-a-l/falkon.profile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/etc/profile-a-l/falkon.profile b/etc/profile-a-l/falkon.profile index d805766eb..2a30d2e23 100644 --- a/etc/profile-a-l/falkon.profile +++ b/etc/profile-a-l/falkon.profile | |||
@@ -41,17 +41,17 @@ nou2f | |||
41 | protocol unix,inet,inet6,netlink | 41 | protocol unix,inet,inet6,netlink |
42 | # blacklisting of chroot system calls breaks falkon | 42 | # blacklisting of chroot system calls breaks falkon |
43 | seccomp !chroot | 43 | seccomp !chroot |
44 | # tracelog | 44 | #tracelog |
45 | 45 | ||
46 | disable-mnt | 46 | disable-mnt |
47 | # private-bin falkon | 47 | #private-bin falkon |
48 | private-cache | 48 | private-cache |
49 | private-dev | 49 | private-dev |
50 | private-etc @tls-ca,@x11,adobe,mailcap,mime.types | 50 | private-etc @tls-ca,@x11,adobe,mailcap,mime.types |
51 | private-tmp | 51 | private-tmp |
52 | 52 | ||
53 | # dbus-user filter | 53 | #dbus-user filter |
54 | # dbus-user.own org.kde.Falkon | 54 | #dbus-user.own org.kde.Falkon |
55 | dbus-system none | 55 | dbus-system none |
56 | 56 | ||
57 | # restrict-namespaces | 57 | #restrict-namespaces |