summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-includes/usr/local/sbin/unsafe-browser
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2018-09-06 10:02:49 +0000
committersajolida <sajolida@pimienta.org>2018-09-06 10:02:49 +0000
commit7d452d39998b5543bacc53696a0897dd2906da4f (patch)
treea51c412b3dbd9b5f3a2100619d8b61d4eebcc78a /config/chroot_local-includes/usr/local/sbin/unsafe-browser
parentbda974fa5d21c9cb2ba54611687d78a1eb11a23f (diff)
parent3629361577a8af12247ec95a151ad3922cc2ecc5 (diff)
Merge remote-tracking branch 'origin/devel' into feature/15291-remove-softwarewip/feature/15291-remove-software-sajolida-experiment
Diffstat (limited to 'config/chroot_local-includes/usr/local/sbin/unsafe-browser')
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/unsafe-browser8
1 files changed, 6 insertions, 2 deletions
diff --git a/config/chroot_local-includes/usr/local/sbin/unsafe-browser b/config/chroot_local-includes/usr/local/sbin/unsafe-browser
index 0ca9eb6..24eb30e 100755
--- a/config/chroot_local-includes/usr/local/sbin/unsafe-browser
+++ b/config/chroot_local-includes/usr/local/sbin/unsafe-browser
@@ -82,7 +82,6 @@ CHROOT="${CONF_DIR}/chroot"
BROWSER_NAME="unsafe-browser"
BROWSER_USER="clearnet"
HUMAN_READABLE_NAME="`gettext \"Unsafe Browser\"`"
-NM_ENV_FILE="/var/lib/NetworkManager/env"
WARNING_PAGE='/usr/share/doc/tails/website/misc/unsafe_browser_warning'
HOME_PAGE="$(localized_tails_doc_page "${WARNING_PAGE}")"
@@ -112,8 +111,13 @@ else
fi
echo "* Starting Unsafe Browser"
+# Do not localize the 5th argument: it becomes WM_CLASS and then GNOME
+# displays the localized app name found in the matching .desktop file;
+# if WM_CLASS were localized then not only string encoding problems
+# would happen, but GNOME would pick the wrong icon.
run_browser_in_chroot "${CHROOT}" "${BROWSER_NAME}" "${BROWSER_USER}" \
- "${SUDO_USER}" || \
+ "${SUDO_USER}" \
+ 'Unsafe Browser' || \
error "`gettext \"Failed to run browser.\"`"
echo "* Exiting the Unsafe Browser"