aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2021-02-08 18:06:43 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2021-02-08 18:47:21 -0300
commit5df1f27c638c487dfd664ea3a0f756565e1e57bd (patch)
treec3f25c55815214db6f3e2cb27cabfe4de8bc78a3
parentarchivers: wrap comments (diff)
downloadfirejail-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.
-rw-r--r--etc/profile-a-l/keepassxc.profile6
-rw-r--r--etc/profile-m-z/Mathematica.profile4
2 files changed, 5 insertions, 5 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
31include disable-xdg.inc 31include 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
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
17mkdir ${HOME}/.Mathematica 17mkdir ${HOME}/.Mathematica
18mkdir ${HOME}/.Wolfram Research 18mkdir ${HOME}/.Wolfram Research
19mkdir ${HOME}/Documents/Wolfram Mathematica 19mkdir ${DOCUMENTS}/Wolfram Mathematica
20whitelist ${HOME}/.Mathematica 20whitelist ${HOME}/.Mathematica
21whitelist ${HOME}/.Wolfram Research 21whitelist ${HOME}/.Wolfram Research
22whitelist ${HOME}/Documents/Wolfram Mathematica 22whitelist ${DOCUMENTS}/Wolfram Mathematica
23include whitelist-common.inc 23include whitelist-common.inc
24 24
25caps.drop all 25caps.drop all