X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fcis-firefox;h=e42e0be91a5e06bc09d718b50f35d82270261144;hb=0028eaa73ae0c3bd1dbf90c4bd508ae705bc386f;hp=190c13232cd12fcde6cb8dfff05c868d43e6c36c;hpb=589342af5c6b0235fc6194ae39f76bbcd12d683e;p=hvlinux.git

diff --git a/stage3/cis-firefox b/stage3/cis-firefox
index 190c132..e42e0be 100755
--- a/stage3/cis-firefox
+++ b/stage3/cis-firefox
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -o errexit
+
 # First argument of this script is the package name
 
 # Reading system configuration informations, functions and package versions.
@@ -6,15 +8,15 @@ source ../sysinfos
 source ../functions
 source ../packages-list
 
-# Applying patches (if any)
-apply_patches ${1} &&
+PACKAGE=${1}
 
-# Get the name of the decompressed directory
-SOURCE_DIR=$(static_decompressed_dirname ${1})
+# Applying patches (if any)
+apply_patches ${PACKAGE}
 
 FIREFOX_BUILD_DIR="${1}-build"
+FIREFOX_PKG_VERSION="firefox-$(get_pkg_ver ${PACKAGE})"
 
-cd ${LFS_TMP}/${SOURCE_DIR} &&
+cd ${LFS_TMP}/${PACKAGE}
 cat > .mozconfig << "EOF"
 # This file contains the options used in the Firefox build.
 
@@ -119,29 +121,28 @@ ac_add_options --enable-strip
 
 EOF
 
-sed -i -e "s!_FIREFOX_BUILD_DIR_!${FIREFOX_BUILD_DIR}!g" .mozconfig &&
+sed -i -e "s!_FIREFOX_BUILD_DIR_!${FIREFOX_BUILD_DIR}!g" .mozconfig
 
-make -f client.mk build &&
-make -f client.mk install &&
+make -f client.mk build
+make -f client.mk install
 
 # Many applications look for netscape when they need to open a browser...
-ln -v -sf firefox /usr/bin/netscape &&
+ln -v -sf firefox /usr/bin/netscape
 
 # Remove old links
-rm -f /usr/lib/mozilla &&
-rm -f /usr/lib/firefox &&
-rm -f /usr/lib/${1}/plugins/libjavaplugin_oji.so &&
+rm -f /usr/lib/mozilla
+rm -f /usr/lib/firefox
+rm -f /usr/lib/${FIREFOX_PKG_VERSION}/plugins/libjavaplugin_oji.so
 
-ln -v -sf ${1} /usr/lib/mozilla &&
-ln -v -sf ${1} /usr/lib/firefox &&
+ln -v -sf ${FIREFOX_PKG_VERSION} /usr/lib/mozilla
+ln -v -sf ${FIREFOX_PKG_VERSION} /usr/lib/firefox
 # To use the installed Java plugin.
-ln -v -s ${JAVA_HOME}/plugin/i386/ns7/libjavaplugin_oji.so /usr/lib/${1}/plugins &&
+ln -v -s ${JAVA_HOME}/plugin/i386/ns7/libjavaplugin_oji.so /usr/lib/${FIREFOX_PKG_VERSION}/plugins
 
 # Addition to /etc/ld.so.conf
 # This is necessary for shared library libmozjs.so (needed by gxine)
-string_add "/usr/lib/${1}" /etc/ld.so.conf &&
+string_add "/usr/lib/${FIREFOX_PKG_VERSION}" /etc/ld.so.conf
 
 ldconfig
 
- # Return last error
 exit $?