Commit eb5e4f4b authored by Tails developers's avatar Tails developers

Name variables as "home page" instead of "start page".

So it's not confused with Tor Browser's default search eninge,
Startpage.
parent 629dd00f
......@@ -176,7 +176,7 @@ configure_chroot_browser () {
local chroot="${1}" ; shift
local browser_name="${1}" ; shift
local browser_user="${1}" ; shift
local startpage="${1}" ; shift
local home_page="${1}" ; shift
# Now $@ is a list of paths (that must be valid after chrooting)
# to extensions to enable.
......@@ -201,9 +201,9 @@ configure_chroot_browser () {
mkdir -p "$(dirname "${browser_prefs}")"
cp /usr/share/tails/"${browser_name}/prefs.js" "${browser_prefs}"
# Set start page to something that explains what's going on
if [ -n "${startpage}" ]; then
echo 'user_pref("browser.startup.homepage", "'"${startpage}"'");' >> \
# Set browser home page to something that explains what's going on
if [ -n "${home_page}" ]; then
echo 'user_pref("browser.startup.homepage", "'"${home_page}"'");' >> \
"${browser_prefs}"
fi
......
......@@ -88,7 +88,7 @@ COW="${CONF_DIR}/cow"
CHROOT="${CONF_DIR}/chroot"
BROWSER_NAME="i2p-browser"
BROWSER_USER="i2pbrowser"
START_PAGE="http://127.0.0.1:7657"
HOME_PAGE="http://127.0.0.1:7657"
NOSCRIPT_EXT_XPI="${TBB_EXT}/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
TORBUTTON_EXT_DIR="${TBB_EXT}/torbutton@torproject.org"
HUMAN_READABLE_NAME="`gettext \"I2P Browser\"`"
......@@ -112,7 +112,7 @@ setup_browser_chroot "${CHROOT}" "${COW}" "${BROWSER_USER}" || \
echo "* Configuring chroot"
configure_chroot_dns_servers "${CHROOT}" "0.0.0.0"
configure_chroot_browser "${CHROOT}" "${BROWSER_NAME}" "${BROWSER_USER}" \
"${START_PAGE}" "${TBB_EXT}"/langpack-*.xpi \
"${HOME_PAGE}" "${TBB_EXT}"/langpack-*.xpi \
"${NOSCRIPT_EXT_XPI}" "${TORBUTTON_EXT_DIR}" && \
copy_extra_tbb_prefs "${CHROOT}" "${BROWSER_NAME}" "${BROWSER_USER}" && \
set_chroot_browser_locale "${CHROOT}" "${BROWSER_NAME}" "${BROWSER_USER}" \
......
......@@ -86,7 +86,7 @@ HUMAN_READABLE_NAME="`gettext \"Unsafe Browser\"`"
NM_ENV_FILE="/var/lib/NetworkManager/env"
BEST_LOCALE="$(guess_best_tor_browser_locale)"
WARNING_PAGE='/usr/share/doc/tails/website/misc/unsafe_browser_warning'
START_PAGE="$(localized_tails_doc_page "${WARNING_PAGE}")"
HOME_PAGE="$(localized_tails_doc_page "${WARNING_PAGE}")"
# Prevent multiple instances of the script.
exec 9>"${LOCK}"
......@@ -126,7 +126,7 @@ setup_browser_chroot "${CHROOT}" "${COW}" "${BROWSER_USER}" || \
echo "* Configuring chroot"
configure_chroot_dns_servers "${CHROOT}" "${IP4_NAMESERVERS}" && \
configure_chroot_browser "${CHROOT}" "${BROWSER_NAME}" "${BROWSER_USER}" \
"${START_PAGE}" "${TBB_EXT}"/langpack-*.xpi && \
"${HOME_PAGE}" "${TBB_EXT}"/langpack-*.xpi && \
set_chroot_browser_locale "${CHROOT}" "${BROWSER_NAME}" "${BROWSER_USER}" \
"${BEST_LOCALE}" && \
set_chroot_browser_name "${CHROOT}" "${HUMAN_READABLE_NAME}" "${BROWSER_NAME}" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment