From f5de6d6d06692c211bd91183e5104cada273f2f8 Mon Sep 17 00:00:00 2001
From: rusty-snake <print_hello_world+Public@protonmail.com>
Date: Mon, 28 Oct 2019 15:17:48 +0000
Subject: Rework waterfox profile (#3014)

closes #3013
---
 etc/waterfox-classic.profile |  7 +++++++
 etc/waterfox-current.profile |  7 +++++++
 etc/waterfox.profile         | 13 ++++++-------
 src/firecfg/firecfg.config   |  2 ++
 4 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 etc/waterfox-classic.profile
 create mode 100644 etc/waterfox-current.profile

diff --git a/etc/waterfox-classic.profile b/etc/waterfox-classic.profile
new file mode 100644
index 000000000..6c7e18a46
--- /dev/null
+++ b/etc/waterfox-classic.profile
@@ -0,0 +1,7 @@
+# Firejail profile for waterfox-classic
+# This file is overwritten after every install/update
+# Persistent local customizations
+include waterfox-classic.local
+
+# Redirect
+include waterfox.profile
diff --git a/etc/waterfox-current.profile b/etc/waterfox-current.profile
new file mode 100644
index 000000000..5e12a6fe3
--- /dev/null
+++ b/etc/waterfox-current.profile
@@ -0,0 +1,7 @@
+# Firejail profile for waterfox-current
+# This file is overwritten after every install/update
+# Persistent local customizations
+include waterfox-current.local
+
+# Redirect
+include waterfox.profile
diff --git a/etc/waterfox.profile b/etc/waterfox.profile
index b8ee67ae0..c6c940fa3 100644
--- a/etc/waterfox.profile
+++ b/etc/waterfox.profile
@@ -5,22 +5,21 @@ include waterfox.local
 # Persistent global definitions
 include globals.local
 
-noblacklist ${HOME}/.cache/mozilla
 noblacklist ${HOME}/.cache/waterfox
-noblacklist ${HOME}/.mozilla
 noblacklist ${HOME}/.waterfox
 
-mkdir ${HOME}/.cache/mozilla/firefox
-mkdir ${HOME}/.mozilla
 mkdir ${HOME}/.cache/waterfox
 mkdir ${HOME}/.waterfox
-whitelist ${HOME}/.cache/mozilla/firefox
 whitelist ${HOME}/.cache/waterfox
-whitelist ${HOME}/.mozilla
 whitelist ${HOME}/.waterfox
 
+# Uncomment (or add to watefox.local) the following lines if you want to
+# use the migration wizard.
+#noblacklist ${HOME}/.mozilla
+#whitelist ${HOME}/.mozilla
+
 # waterfox requires a shell to launch on Arch. We can possibly remove sh though.
-#private-bin bash,dbus-launch,dbus-send,env,sh,waterfox,which
+#private-bin bash,dbus-launch,dbus-send,env,sh,waterfox,waterfox-classic,waterfox-current,which
 # private-etc must first be enabled in firefox-common.profile
 #private-etc waterfox
 
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 891771c6c..21f10ebd2 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -648,6 +648,8 @@ w3m
 warsow
 warzone2100
 waterfox
+waterfox-classic
+waterfox-current
 webstorm
 weechat
 weechat-curses
-- 
cgit v1.2.3-70-g09d2