From 5df1f27c638c487dfd664ea3a0f756565e1e57bd Mon Sep 17 00:00:00 2001
From: "Kelvin M. Klann" <kmk3.code@protonmail.com>
Date: Mon, 8 Feb 2021 18:06:43 -0300
Subject: 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.
---
 etc/profile-a-l/keepassxc.profile   | 6 +++---
 etc/profile-m-z/Mathematica.profile | 4 ++--
 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
 include disable-xdg.inc
 
 # You can enable whitelisting for keepassxc by uncommenting (or adding to you keepassxc.local) the following lines.
-# If you do so, you MUST store your database under ${HOME}/Documents/KeePassXC/foo.kdbx
-#mkdir ${HOME}/Documents/KeePassXC
-#whitelist ${HOME}/Documents/KeePassXC
+# If you do so, you MUST store your database under ${DOCUMENTS}/KeePassXC/foo.kdbx
+#mkdir ${DOCUMENTS}/KeePassXC
+#whitelist ${DOCUMENTS}/KeePassXC
 # Needed for KeePassXC-Browser
 #mkfile ${HOME}/.config/BraveSoftware/Brave-Browser/NativeMessagingHosts/org.keepassxc.keepassxc_browser.json
 #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
 
 mkdir ${HOME}/.Mathematica
 mkdir ${HOME}/.Wolfram Research
-mkdir ${HOME}/Documents/Wolfram Mathematica
+mkdir ${DOCUMENTS}/Wolfram Mathematica
 whitelist ${HOME}/.Mathematica
 whitelist ${HOME}/.Wolfram Research
-whitelist ${HOME}/Documents/Wolfram Mathematica
+whitelist ${DOCUMENTS}/Wolfram Mathematica
 include whitelist-common.inc
 
 caps.drop all
-- 
cgit v1.2.3-54-g00ecf