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-m-z | |
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-m-z')
-rw-r--r-- | etc/profile-m-z/Mathematica.profile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/profile-m-z/Mathematica.profile b/etc/profile-m-z/Mathematica.profile index c2734b1c1..0f79b6a97 100644 --- a/etc/profile-m-z/Mathematica.profile +++ b/etc/profile-m-z/Mathematica.profile | |||
@@ -16,10 +16,10 @@ include disable-programs.inc | |||
16 | 16 | ||
17 | mkdir ${HOME}/.Mathematica | 17 | mkdir ${HOME}/.Mathematica |
18 | mkdir ${HOME}/.Wolfram Research | 18 | mkdir ${HOME}/.Wolfram Research |
19 | mkdir ${HOME}/Documents/Wolfram Mathematica | 19 | mkdir ${DOCUMENTS}/Wolfram Mathematica |
20 | whitelist ${HOME}/.Mathematica | 20 | whitelist ${HOME}/.Mathematica |
21 | whitelist ${HOME}/.Wolfram Research | 21 | whitelist ${HOME}/.Wolfram Research |
22 | whitelist ${HOME}/Documents/Wolfram Mathematica | 22 | whitelist ${DOCUMENTS}/Wolfram Mathematica |
23 | include whitelist-common.inc | 23 | include whitelist-common.inc |
24 | 24 | ||
25 | caps.drop all | 25 | caps.drop all |