summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-02-04 14:58:14 +0100
committeranonym <anonym@riseup.net>2016-02-04 14:58:14 +0100
commit0e79909fdb81d13500ea0d488f19723a1f334cbc (patch)
tree344b7b21a41db6555028aa568d5a49effcc6704d
parentc11fbca6bfef30b23a1a93324c26b1f6c011b38a (diff)
Improve the directory of for the chroot browser config.
-rw-r--r--config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh12
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/common/prefs.js (renamed from config/chroot_local-includes/usr/share/tails/chroot-browser/prefs.js)0
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/common/userChrome.css (renamed from config/chroot_local-includes/usr/share/tails/chroot-browser/userChrome.css)0
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/prefs.js (renamed from config/chroot_local-includes/usr/share/tails/i2p-browser/prefs.js)0
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/theme.js (renamed from config/chroot_local-includes/usr/share/tails/i2p-browser/theme.js)0
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/userChrome.css (renamed from config/chroot_local-includes/usr/share/tails/i2p-browser/userChrome.css)0
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/prefs.js (renamed from config/chroot_local-includes/usr/share/tails/unsafe-browser/prefs.js)0
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/theme.js (renamed from config/chroot_local-includes/usr/share/tails/unsafe-browser/theme.js)0
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/userChrome.css (renamed from config/chroot_local-includes/usr/share/tails/unsafe-browser/userChrome.css)0
9 files changed, 7 insertions, 5 deletions
diff --git a/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh b/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh
index 8deab60..3d3a515 100644
--- a/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh
+++ b/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh
@@ -132,9 +132,10 @@ configure_chroot_browser_profile () {
# Set preferences
local browser_prefs="${browser_profile}/preferences/prefs.js"
+ local chroot_browser_config="/usr/share/tails/chroot-browsers"
mkdir -p "$(dirname "${browser_prefs}")"
- cat "/usr/share/tails/chroot-browser/prefs.js" \
- "/usr/share/tails/${browser_name}/prefs.js" > "${browser_prefs}"
+ cat "${chroot_browser_config}/common/prefs.js" \
+ "${chroot_browser_config}/${browser_name}/prefs.js" > "${browser_prefs}"
# Set browser home page to something that explains what's going on
if [ -n "${home_page}" ]; then
@@ -146,13 +147,14 @@ configure_chroot_browser_profile () {
rm "${chroot}/${TBB_PROFILE}/bookmarks.html"
# Set an appropriate theme
- cat "/usr/share/tails/${browser_name}/theme.js" >> "${browser_prefs}"
+ cat "${chroot_browser_config}/${browser_name}/theme.js" >> "${browser_prefs}"
# Customize the GUI.
local browser_chrome="${browser_profile}/chrome/userChrome.css"
mkdir -p "$(dirname "${browser_chrome}")"
- cat "/usr/share/tails/chroot-browser/userChrome.css" \
- "/usr/share/tails/${browser_name}/userChrome.css" >> "${browser_chrome}"
+ cat "${chroot_browser_config}/common/userChrome.css" \
+ "${chroot_browser_config}/${browser_name}/userChrome.css" >> \
+ "${browser_chrome}"
set_chroot_browser_permissions "${chroot}" "${browser_name}" "${browser_user}"
}
diff --git a/config/chroot_local-includes/usr/share/tails/chroot-browser/prefs.js b/config/chroot_local-includes/usr/share/tails/chroot-browsers/common/prefs.js
index 606e9d5..606e9d5 100644
--- a/config/chroot_local-includes/usr/share/tails/chroot-browser/prefs.js
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/common/prefs.js
diff --git a/config/chroot_local-includes/usr/share/tails/chroot-browser/userChrome.css b/config/chroot_local-includes/usr/share/tails/chroot-browsers/common/userChrome.css
index cf4822c..cf4822c 100644
--- a/config/chroot_local-includes/usr/share/tails/chroot-browser/userChrome.css
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/common/userChrome.css
diff --git a/config/chroot_local-includes/usr/share/tails/i2p-browser/prefs.js b/config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/prefs.js
index 3db72d1..3db72d1 100644
--- a/config/chroot_local-includes/usr/share/tails/i2p-browser/prefs.js
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/prefs.js
diff --git a/config/chroot_local-includes/usr/share/tails/i2p-browser/theme.js b/config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/theme.js
index 3d79365..3d79365 100644
--- a/config/chroot_local-includes/usr/share/tails/i2p-browser/theme.js
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/theme.js
diff --git a/config/chroot_local-includes/usr/share/tails/i2p-browser/userChrome.css b/config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/userChrome.css
index 3dce6d6..3dce6d6 100644
--- a/config/chroot_local-includes/usr/share/tails/i2p-browser/userChrome.css
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/userChrome.css
diff --git a/config/chroot_local-includes/usr/share/tails/unsafe-browser/prefs.js b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/prefs.js
index 8062867..8062867 100644
--- a/config/chroot_local-includes/usr/share/tails/unsafe-browser/prefs.js
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/prefs.js
diff --git a/config/chroot_local-includes/usr/share/tails/unsafe-browser/theme.js b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/theme.js
index 717c3b1..717c3b1 100644
--- a/config/chroot_local-includes/usr/share/tails/unsafe-browser/theme.js
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/theme.js
diff --git a/config/chroot_local-includes/usr/share/tails/unsafe-browser/userChrome.css b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/userChrome.css
index e0185e7..e0185e7 100644
--- a/config/chroot_local-includes/usr/share/tails/unsafe-browser/userChrome.css
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/userChrome.css