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/catfish.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/catfish.profile')
-rw-r--r-- | etc/profile-a-l/catfish.profile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/profile-a-l/catfish.profile b/etc/profile-a-l/catfish.profile index e2df341e9..037f6ee40 100644 --- a/etc/profile-a-l/catfish.profile +++ b/etc/profile-a-l/catfish.profile | |||
@@ -15,10 +15,10 @@ noblacklist ${HOME}/.config/catfish | |||
15 | include allow-python2.inc | 15 | include allow-python2.inc |
16 | include allow-python3.inc | 16 | include allow-python3.inc |
17 | 17 | ||
18 | # include disable-common.inc | 18 | #include disable-common.inc |
19 | # include disable-devel.inc | 19 | #include disable-devel.inc |
20 | include disable-interpreters.inc | 20 | include disable-interpreters.inc |
21 | # include disable-programs.inc | 21 | #include disable-programs.inc |
22 | 22 | ||
23 | whitelist /var/lib/mlocate | 23 | whitelist /var/lib/mlocate |
24 | include whitelist-var-common.inc | 24 | include whitelist-var-common.inc |
@@ -40,9 +40,9 @@ tracelog | |||
40 | 40 | ||
41 | # These options work but are disabled in case | 41 | # These options work but are disabled in case |
42 | # a users wants to search in these directories. | 42 | # a users wants to search in these directories. |
43 | # private-bin bash,catfish,env,locate,ls,mlocate,python* | 43 | #private-bin bash,catfish,env,locate,ls,mlocate,python* |
44 | # private-dev | 44 | #private-dev |
45 | # private-tmp | 45 | #private-tmp |
46 | 46 | ||
47 | dbus-user none | 47 | dbus-user none |
48 | dbus-system none | 48 | dbus-system none |