diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2021-02-08 18:06:43 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2021-02-08 18:47:21 -0300 |
commit | 5df1f27c638c487dfd664ea3a0f756565e1e57bd (patch) | |
tree | c3f25c55815214db6f3e2cb27cabfe4de8bc78a3 /etc/profile-a-l | |
parent | archivers: wrap comments (diff) | |
download | firejail-5df1f27c638c487dfd664ea3a0f756565e1e57bd.tar.gz firejail-5df1f27c638c487dfd664ea3a0f756565e1e57bd.tar.zst firejail-5df1f27c638c487dfd664ea3a0f756565e1e57bd.zip |
etc: use ${DOCUMENTS} macro where appropriate
Currently, some paths are hard-coded:
$ grep -Fnr '${HOME}/Documents' etc etc-fixes
etc/profile-m-z/Mathematica.profile:19:mkdir ${HOME}/Documents/Wolfram Mathematica
etc/profile-m-z/Mathematica.profile:22:whitelist ${HOME}/Documents/Wolfram Mathematica
etc/profile-a-l/keepassxc.profile:34:# If you do so, you MUST store your database under ${HOME}/Documents/KeePassXC/foo.kdbx
etc/profile-a-l/keepassxc.profile:35:#mkdir ${HOME}/Documents/KeePassXC
etc/profile-a-l/keepassxc.profile:36:#whitelist ${HOME}/Documents/KeePassXC
Commands used to search and replace:
$ find etc etc-fixes/ -type f -exec \
sed -i.bak -e 's|\${HOME}/Documents|${DOCUMENTS}|' '{}' +
Related to that, the (lack of) usage of ${DOWNLOADS} has been recently
fixed on commit deae31301 ("use ${DOWNLOADS} in lutris.profile
(#3955)").
With the above change, all macros other than ${DOCUMENTS} seem to be
already used appropriately:
$ grep -Fnr '${HOME}/Desktop' etc etc-fixes
$ grep -Fnr '${HOME}/Downloads' etc etc-fixes
$ grep -Fnr '${HOME}/Music' etc etc-fixes
$ grep -Fnr '${HOME}/Pictures' etc etc-fixes
$ grep -Fnr '${HOME}/Videos' etc etc-fixes
See src/firejail/macros.c for details.
Diffstat (limited to 'etc/profile-a-l')
-rw-r--r-- | etc/profile-a-l/keepassxc.profile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/profile-a-l/keepassxc.profile b/etc/profile-a-l/keepassxc.profile index 3ad779a12..365db64aa 100644 --- a/etc/profile-a-l/keepassxc.profile +++ b/etc/profile-a-l/keepassxc.profile | |||
@@ -31,9 +31,9 @@ include disable-shell.inc | |||
31 | include disable-xdg.inc | 31 | include disable-xdg.inc |
32 | 32 | ||
33 | # You can enable whitelisting for keepassxc by uncommenting (or adding to you keepassxc.local) the following lines. | 33 | # You can enable whitelisting for keepassxc by uncommenting (or adding to you keepassxc.local) the following lines. |
34 | # If you do so, you MUST store your database under ${HOME}/Documents/KeePassXC/foo.kdbx | 34 | # If you do so, you MUST store your database under ${DOCUMENTS}/KeePassXC/foo.kdbx |
35 | #mkdir ${HOME}/Documents/KeePassXC | 35 | #mkdir ${DOCUMENTS}/KeePassXC |
36 | #whitelist ${HOME}/Documents/KeePassXC | 36 | #whitelist ${DOCUMENTS}/KeePassXC |
37 | # Needed for KeePassXC-Browser | 37 | # Needed for KeePassXC-Browser |
38 | #mkfile ${HOME}/.config/BraveSoftware/Brave-Browser/NativeMessagingHosts/org.keepassxc.keepassxc_browser.json | 38 | #mkfile ${HOME}/.config/BraveSoftware/Brave-Browser/NativeMessagingHosts/org.keepassxc.keepassxc_browser.json |
39 | #whitelist ${HOME}/.config/BraveSoftware/Brave-Browser/NativeMessagingHosts/org.keepassxc.keepassxc_browser.json | 39 | #whitelist ${HOME}/.config/BraveSoftware/Brave-Browser/NativeMessagingHosts/org.keepassxc.keepassxc_browser.json |