summaryrefslogtreecommitdiffstats
path: root/firefox4.sh.in
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2010-11-06 13:01:57 +0100
committerRemi Collet <fedora@famillecollet.com>2010-11-06 13:01:57 +0100
commit1d81a7236ec40ce5367e824cd7c74a7e0f8d1fff (patch)
treeec2abc18f1b3d5422d26bba55a6d9558b157b159 /firefox4.sh.in
parent1e280f45ccf3289598a4a288227eac1e555242b7 (diff)
firefox 4.0b7 build1
Diffstat (limited to 'firefox4.sh.in')
-rw-r--r--firefox4.sh.in9
1 files changed, 5 insertions, 4 deletions
diff --git a/firefox4.sh.in b/firefox4.sh.in
index bb28a52..5a72c6b 100644
--- a/firefox4.sh.in
+++ b/firefox4.sh.in
@@ -189,9 +189,10 @@ if [ $MOZILLA_DOWN -ne 0 ]; then
# So that pt-BR doesn't try to use pt for example
SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g"`
MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g"`
+ MANIFEST="chrome.manifest"
# Try to link global langpacks to an extension directory
- if [ -d $MOZ_LANGPACKS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE ]; then
+ if [ -f $MOZ_LANGPACKS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/$MANIFEST ]; then
if [ -d $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org ]; then
rmdir "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org" > /dev/null 2>&1
fi
@@ -200,7 +201,7 @@ if [ $MOZILLA_DOWN -ne 0 ]; then
$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org
echo "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org" > $FEDORA_LANGPACK_CONFIG
fi
- elif [ -d $MOZ_LANGPACKS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE ]; then
+ elif [ -f $MOZ_LANGPACKS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/$MANIFEST ]; then
if [ -d $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org ]; then
rmdir "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org" > /dev/null 2>&1
fi
@@ -212,10 +213,10 @@ if [ $MOZILLA_DOWN -ne 0 ]; then
fi
# And set it up for mozilla
- if [ -d $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE ]; then
+ if [ -f $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/$MANIFEST ]; then
MOZARGS="-UILocale $SHORTMOZLOCALE"
else
- if [ -d $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE ]; then
+ if [ -f $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/$MANIFEST ]; then
MOZARGS="-UILocale $MOZLOCALE"
fi
fi