summaryrefslogtreecommitdiff
path: root/firefox.sh.in
diff options
context:
space:
mode:
Diffstat (limited to 'firefox.sh.in')
-rw-r--r--firefox.sh.in21
1 files changed, 2 insertions, 19 deletions
diff --git a/firefox.sh.in b/firefox.sh.in
index 98a8b0c..a310721 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -83,19 +83,10 @@ MOZILLA_FIVE_HOME="$MOZ_DIST_BIN"
export MOZILLA_FIVE_HOME
##
-## Select the propper plugin dir
-## Wrapped plug-ins are located in /lib/mozilla/plugins-wrapped
-##
-if [ -x "/usr/bin/mozilla-plugin-config" ]
-then
- MOZ_PLUGIN_DIR="plugins-wrapped"
-else
- MOZ_PLUGIN_DIR="plugins"
-fi
-
-##
## Make sure that we set the plugin path
##
+MOZ_PLUGIN_DIR="plugins"
+
if [ "$MOZ_PLUGIN_PATH" ]
then
MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$MOZ_LIB_DIR/mozilla/$MOZ_PLUGIN_DIR:$MOZ_DIST_BIN/$MOZ_PLUGIN_DIR
@@ -110,14 +101,6 @@ export MOZ_PLUGIN_PATH
export MOZ_APP_LAUNCHER="/usr/bin/firefox"
##
-## If plugins are wrapped, check them
-##
-if [ -x "/usr/bin/mozilla-plugin-config" ]
-then
- /usr/bin/mozilla-plugin-config
-fi
-
-##
## Set FONTCONFIG_PATH for Xft/fontconfig
##
FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
bgstack15