From 0813120c79f57c365496157978ab6483657b2194 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Thu, 21 Mar 2019 15:18:35 +0100
Subject: Fixed /usr in launch scripts to allow run in container

---
 firefox.sh.in | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'firefox.sh.in')

diff --git a/firefox.sh.in b/firefox.sh.in
index 06819d1..5cd169d 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -17,10 +17,10 @@
 # Copyright (C) 1998 Netscape Communications Corporation. All
 # Rights Reserved.
 #
-# Contributor(s): 
+# Contributor(s):
 #
 
-## 
+##
 ## Usage:
 ##
 ## $ firefox
@@ -39,12 +39,12 @@ cmdname=`basename $0`
 MOZ_ARCH=$(uname -m)
 case $MOZ_ARCH in
 	x86_64 | s390x | sparc64)
-		MOZ_LIB_DIR="/usr/lib64"
-		SECONDARY_LIB_DIR="/usr/lib"
+		MOZ_LIB_DIR="/__PREFIX__/lib64"
+		SECONDARY_LIB_DIR="/__PREFIX__/lib"
 		;;
 	* )
-		MOZ_LIB_DIR="/usr/lib"
-		SECONDARY_LIB_DIR="/usr/lib64"
+		MOZ_LIB_DIR="/__PREFIX__/lib"
+		SECONDARY_LIB_DIR="/__PREFIX__/lib64"
 		;;
 esac
 
@@ -79,7 +79,7 @@ fi
 ## Set MOZ_GRE_CONF
 ##
 MOZ_GRE_CONF=/etc/gre.d/gre.conf
-if [ "$MOZ_LIB_DIR" == "/usr/lib64" ]; then
+if [ "$MOZ_LIB_DIR" == "/__PREFIX__/lib64" ]; then
   MOZ_GRE_CONF=/etc/gre.d/gre64.conf
 fi
 export MOZ_GRE_CONF
@@ -107,7 +107,7 @@ export MOZ_PLUGIN_PATH
 ##
 ## Set MOZ_APP_LAUNCHER for gnome-session
 ##
-export MOZ_APP_LAUNCHER="/usr/bin/firefox"
+export MOZ_APP_LAUNCHER="/__PREFIX__/bin/firefox"
 
 ##
 ## Set FONTCONFIG_PATH for Xft/fontconfig
@@ -116,9 +116,9 @@ FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
 export FONTCONFIG_PATH
 
 ##
-## In order to better support certain scripts (such as Indic and some CJK 
-## scripts), Fedora builds its Firefox, with permission from the Mozilla 
-## Corporation, with the Pango system as its text renderer.  This change 
+## In order to better support certain scripts (such as Indic and some CJK
+## scripts), Fedora builds its Firefox, with permission from the Mozilla
+## Corporation, with the Pango system as its text renderer.  This change
 ## may negatively impact performance on some pages.  To disable the use of
 ## Pango, set MOZ_DISABLE_PANGO=1 in your environment before launching
 ## Firefox.
@@ -167,12 +167,12 @@ MOZILLA_DOWN=0
 if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then
     if [ -x $MOZ_DIST_BIN/$MOZ_FIREFOX_FILE ]; then
         # Is firefox running?
-        /usr/bin/pidof firefox > /dev/null 2>&1
+        /__PREFIX__/bin/pidof firefox > /dev/null 2>&1
         MOZILLA_DOWN=$?
     fi
 fi
 
-# Modify language pack configuration only when firefox is not running 
+# Modify language pack configuration only when firefox is not running
 # and language packs are not disabled
 if [ $MOZILLA_DOWN -ne 0 ]; then
 
@@ -199,7 +199,7 @@ if [ $MOZILLA_DOWN -ne 0 ]; then
         local langpack=langpack-${language}@firefox.mozilla.org.xpi
         if [ -f $MOZ_LANGPACKS_DIR/$langpack ]; then
             rm -rf $MOZ_EXTENSIONS_PROFILE_DIR/$langpack
-            # If the target file is a symlink (the fallback langpack), 
+            # If the target file is a symlink (the fallback langpack),
             # install the original file instead of the fallback one
             if [ -h $MOZ_LANGPACKS_DIR/$langpack ]; then
                 langpack=`readlink $MOZ_LANGPACKS_DIR/$langpack`
-- 
cgit