summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@anakreon.cz>2011-01-06 08:39:35 +0100
committerMartin Stransky <stransky@anakreon.cz>2011-01-06 08:39:35 +0100
commit5cc9effe5e2c2cdfb8e09e0777f04e26ff2e1bc7 (patch)
tree79acc0ab1d23e77cc83dcf50577bd21f4d6c57a9
parentFixed rhbz#664877 - Cannot read application.ini (diff)
downloadlibrewolf-fedora-ff-5cc9effe5e2c2cdfb8e09e0777f04e26ff2e1bc7.tar.gz
librewolf-fedora-ff-5cc9effe5e2c2cdfb8e09e0777f04e26ff2e1bc7.tar.bz2
librewolf-fedora-ff-5cc9effe5e2c2cdfb8e09e0777f04e26ff2e1bc7.zip
Fixed rhbz#667477 - broken launch script
-rw-r--r--firefox.sh.in12
-rw-r--r--firefox.spec5
2 files changed, 11 insertions, 6 deletions
diff --git a/firefox.sh.in b/firefox.sh.in
index fd5ab10..cb6373b 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -48,11 +48,13 @@ case $MOZ_ARCH in
;;
esac
-if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox ]; then
- if [ ! -x $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox ]; then
- echo "Error: $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox not found"
+MOZ_FIREFOX_FILE="application.ini"
+
+if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE ]; then
+ if [ ! -x $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE ]; then
+ echo "Error: $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE not found"
if [ -d $SECONDARY_LIB_DIR ]; then
- echo " $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox not found"
+ echo " $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE not found"
fi
exit 1
fi
@@ -62,7 +64,7 @@ MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION"
MOZ_XUL_DIR="$MOZ_LIB_DIR/XULRUNNER_DIRECTORY"
MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks"
MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-MOZ_PROGRAM="/usr/bin/xulrunner $MOZ_DIST_BIN/application.ini"
+MOZ_PROGRAM="/usr/bin/xulrunner $MOZ_DIST_BIN/$MOZ_FIREFOX_FILE"
MOZ_LAUCHER="$MOZ_DIST_BIN/run-mozilla.sh"
##
diff --git a/firefox.spec b/firefox.spec
index 4cbd623..0171096 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -26,7 +26,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 4.0
-Release: 0.8%{?prever}%{?dist}
+Release: 0.9%{?prever}%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -386,6 +386,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Tue Jan 6 2011 Martin Stransky <stransky@redhat.com> - 4.0-0.9b8
+- Fixed rhbz#667477 - broken launch script
+
* Tue Jan 4 2011 Martin Stransky <stransky@redhat.com> - 4.0-0.8b8
- Fixed rhbz#664877 - Cannot read application.ini
bgstack15