Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
tails
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
955
Issues
955
List
Boards
Labels
Service Desk
Milestones
Merge Requests
13
Merge Requests
13
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tails
tails
Commits
629dd00f
Commit
629dd00f
authored
Nov 28, 2014
by
Tails developers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge set_chroot_torbutton_browser_name () into set_chroot_browser_name().
parent
3afc3d40
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
21 deletions
+28
-21
config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh
...ludes/usr/local/lib/tails-shell-library/chroot-browser.sh
+24
-17
config/chroot_local-includes/usr/local/sbin/i2p-browser
config/chroot_local-includes/usr/local/sbin/i2p-browser
+2
-2
config/chroot_local-includes/usr/local/sbin/unsafe-browser
config/chroot_local-includes/usr/local/sbin/unsafe-browser
+2
-2
No files found.
config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh
View file @
629dd00f
...
...
@@ -90,11 +90,32 @@ set_chroot_browser_locale () {
configure_xulrunner_app_locale
"
${
browser_profile
}
"
"
${
locale
}
"
}
# Must be called after configure_chroot_browser(), since it depends on
# which extensions are installed in the profile.
set_chroot_browser_name
()
{
local chroot
=
"
${
1
}
"
local
name
=
"
${
2
}
"
local
locale
=
"
${
3
}
"
local
human_readable_name
=
"
${
2
}
"
local
browser_name
=
"
${
3
}
"
local
browser_user
=
"
${
4
}
"
local
locale
=
"
${
5
}
"
local
ext_dir
=
"
${
chroot
}
/
${
TBB_EXT
}
"
local
browser_profile_ext_dir
=
"
$(
chroot_browser_profile_dir
"
${
chroot
}
"
"
${
browser_name
}
"
"
${
browser_user
}
"
)
/extensions"
# If Torbutton is installed in the browser profile, it will decide
# the browser name.
if
[
-e
"
${
browser_profile_ext_dir
}
/torbutton@torproject.org"
]
;
then
local
torbutton_locale_dir
=
"
${
ext_dir
}
/torbutton/chrome/locale/
${
locale
}
"
if
[
!
-d
"
${
torbutton_locale_dir
}
"
]
;
then
# Surprisingly, the default locale is en, not en-US
torbutton_locale_dir
=
"
${
chroot
}
"
/usr/share/xul-ext/torbutton/chrome/locale/en
fi
sed
-i
"s/<"
'!'
"ENTITY
\s\+
brand
\(
Full
\|
Short
\)
Name.*
$/
<"
'!'
"ENTITY brand
\1
Name
\"
${
human_readable_name
}
\"
>/"
"
${
torbutton_locale_dir
}
/brand.dtd"
# Since Torbutton decides the name, we don't have to mess with
# with the browser's own branding, which will save time and
# memory.
return
fi
local
pack top rest
if
[
"
${
locale
}
"
!=
"en-US"
]
;
then
pack
=
"
${
ext_dir
}
/langpack-
${
locale
}
@firefox.mozilla.org.xpi"
...
...
@@ -110,7 +131,7 @@ set_chroot_browser_name () {
# Non-zero exit code due to non-standard ZIP archive.
# The following steps will fail soon if the extraction failed anyway.
7z x
-o
"
${
tmp
}
"
"
${
pack
}
"
"
${
branding
}
"
||
true
sed
-i
"s/<"
'!'
"ENTITY
\s\+
brand
\(
Full
\|
Short
\)
Name.*
$/
<"
'!'
"ENTITY brand
\1
Name
\"
${
name
}
\"
>/"
"
${
tmp
}
/
${
branding
}
"
sed
-i
"s/<"
'!'
"ENTITY
\s\+
brand
\(
Full
\|
Short
\)
Name.*
$/
<"
'!'
"ENTITY brand
\1
Name
\"
${
human_readable_
name
}
\"
>/"
"
${
tmp
}
/
${
branding
}
"
(
cd
${
tmp
}
;
7z u
-tzip
"
${
pack
}
"
.
)
chmod
a+r
"
${
pack
}
"
rm
-Rf
"
${
tmp
}
"
...
...
@@ -131,20 +152,6 @@ run_browser_in_chroot () {
sudo
-u
${
local_user
}
xhost
-SI
:localuser:
${
chroot_user
}
2>/dev/null
}
# TorButton forces the Browser name to Tor Browser unless we alter its
# branding files a bit.
set_chroot_torbutton_browser_name
()
{
local chroot
=
"
${
1
}
"
local
name
=
"
${
2
}
"
local
locale
=
"
${
3
}
"
local
torbutton_locale_dir
=
"
${
chroot
}
"
/usr/share/xul-ext/torbutton/chrome/locale/
${
locale
}
if
[
!
-d
"
${
torbutton_locale_dir
}
"
]
;
then
# Surprisingly, the default locale is en, not en-US
torbutton_locale_dir
=
"
${
chroot
}
"
/usr/share/xul-ext/torbutton/chrome/locale/en
fi
sed
-i
"s/<"
'!'
"ENTITY
\s\+
brand
\(
Full
\|
Short
\)
Name.*
$/
<"
'!'
"ENTITY brand
\1
Name
\"
${
name
}
\"
>/"
"
${
torbutton_locale_dir
}
/brand.dtd"
}
# Set the chroot's DNS servers (IPv4 only)
configure_chroot_dns_servers
()
{
local chroot
=
"
${
1
}
"
;
shift
...
...
config/chroot_local-includes/usr/local/sbin/i2p-browser
View file @
629dd00f
...
...
@@ -117,8 +117,8 @@ configure_chroot_browser "${CHROOT}" "${BROWSER_NAME}" "${BROWSER_USER}" \
copy_extra_tbb_prefs
"
${
CHROOT
}
"
"
${
BROWSER_NAME
}
"
"
${
BROWSER_USER
}
"
&&
\
set_chroot_browser_locale
"
${
CHROOT
}
"
"
${
BROWSER_NAME
}
"
"
${
BROWSER_USER
}
"
\
"
${
BEST_LOCALE
}
"
&&
\
set_chroot_
torbutton_browser_name
"
${
CHROOT
}
"
"
${
HUMAN_READABLE
_NAME
}
"
\
"
${
BEST_LOCALE
}
"
&&
\
set_chroot_
browser_name
"
${
CHROOT
}
"
"
${
HUMAN_READABLE_NAME
}
"
"
${
BROWSER
_NAME
}
"
\
"
${
B
ROWSER_USER
}
"
"
${
B
EST_LOCALE
}
"
&&
\
set_chroot_browser_permissions
"
${
CHROOT
}
"
"
${
BROWSER_NAME
}
"
\
"
${
BROWSER_USER
}
"
||
\
error
"
`
gettext
\"
Failed to configure browser.
\"
`
"
...
...
config/chroot_local-includes/usr/local/sbin/unsafe-browser
View file @
629dd00f
...
...
@@ -129,8 +129,8 @@ configure_chroot_browser "${CHROOT}" "${BROWSER_NAME}" "${BROWSER_USER}" \
"
${
START_PAGE
}
"
"
${
TBB_EXT
}
"
/langpack-
*
.xpi
&&
\
set_chroot_browser_locale
"
${
CHROOT
}
"
"
${
BROWSER_NAME
}
"
"
${
BROWSER_USER
}
"
\
"
${
BEST_LOCALE
}
"
&&
\
set_chroot_browser_name
"
${
CHROOT
}
"
"
${
HUMAN_READABLE_NAME
}
"
\
"
${
BEST_LOCALE
}
"
&&
\
set_chroot_browser_name
"
${
CHROOT
}
"
"
${
HUMAN_READABLE_NAME
}
"
"
${
BROWSER_NAME
}
"
\
"
${
B
ROWSER_USER
}
"
"
${
B
EST_LOCALE
}
"
&&
\
set_chroot_browser_permissions
"
${
CHROOT
}
"
"
${
BROWSER_NAME
}
"
\
"
${
BROWSER_USER
}
"
||
\
error
"
`
gettext
\"
Failed to configure browser.
\"
`
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment