diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-08-11 05:26:05 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-09-08 04:57:37 -0300 |
commit | c6d33375cc34e4e5e527ab43c219adfbc8848c62 (patch) | |
tree | 0ccf4359f9b8ab8a5c4e37bd042fbf19314f12a8 /etc/profile-m-z/thunderbird.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-m-z/thunderbird.profile')
-rw-r--r-- | etc/profile-m-z/thunderbird.profile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/profile-m-z/thunderbird.profile b/etc/profile-m-z/thunderbird.profile index 17e2f0856..979971ac2 100644 --- a/etc/profile-m-z/thunderbird.profile +++ b/etc/profile-m-z/thunderbird.profile | |||
@@ -35,7 +35,7 @@ whitelist ${HOME}/.mozilla/firefox/profiles.ini | |||
35 | 35 | ||
36 | noblacklist ${HOME}/.cache/thunderbird | 36 | noblacklist ${HOME}/.cache/thunderbird |
37 | noblacklist ${HOME}/.gnupg | 37 | noblacklist ${HOME}/.gnupg |
38 | # noblacklist ${HOME}/.icedove | 38 | #noblacklist ${HOME}/.icedove |
39 | noblacklist ${HOME}/.thunderbird | 39 | noblacklist ${HOME}/.thunderbird |
40 | 40 | ||
41 | include disable-xdg.inc | 41 | include disable-xdg.inc |
@@ -46,11 +46,11 @@ include disable-xdg.inc | |||
46 | # See https://github.com/netblue30/firejail/issues/2357 | 46 | # See https://github.com/netblue30/firejail/issues/2357 |
47 | mkdir ${HOME}/.cache/thunderbird | 47 | mkdir ${HOME}/.cache/thunderbird |
48 | mkdir ${HOME}/.gnupg | 48 | mkdir ${HOME}/.gnupg |
49 | # mkdir ${HOME}/.icedove | 49 | #mkdir ${HOME}/.icedove |
50 | mkdir ${HOME}/.thunderbird | 50 | mkdir ${HOME}/.thunderbird |
51 | whitelist ${HOME}/.cache/thunderbird | 51 | whitelist ${HOME}/.cache/thunderbird |
52 | whitelist ${HOME}/.gnupg | 52 | whitelist ${HOME}/.gnupg |
53 | # whitelist ${HOME}/.icedove | 53 | #whitelist ${HOME}/.icedove |
54 | whitelist ${HOME}/.thunderbird | 54 | whitelist ${HOME}/.thunderbird |
55 | 55 | ||
56 | whitelist /usr/share/gnupg | 56 | whitelist /usr/share/gnupg |