-Amélioré fonctions de download des packages

[hvlinux.git] / stage5 / pkg / firefox

diff --git a/stage5/pkg/firefox b/stage5/pkg/firefox
index e42e0be..119fc8d 100644 (file)
--- a/stage5/pkg/firefox
+++ b/stage5/pkg/firefox
@@ -1,23 +1,12 @@
-#!/bin/sh
-set -o errexit
+#!/bin/bash
 
-# First argument of this script is the package name
+hvbuild()
+{
+    FIREFOX_BUILD_DIR="${PACKAGE}-build"
+    FIREFOX_PKG_VERSION="firefox-$(get_pkg_ver ${PACKAGE})"
 
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
-
-PACKAGE=${1}
-
-# Applying patches (if any)
-apply_patches ${PACKAGE}
-
-FIREFOX_BUILD_DIR="${1}-build"
-FIREFOX_PKG_VERSION="firefox-$(get_pkg_ver ${PACKAGE})"
-
-cd ${LFS_TMP}/${PACKAGE}
-cat > .mozconfig << "EOF"
+    cd ${LFS_TMP}/${PACKAGE}
+    cat > .mozconfig << "EOF"
 # This file contains the options used in the Firefox build.
 
 # Use the default settings specified in the source tree
@@ -121,28 +110,23 @@ ac_add_options --enable-strip
 
 EOF
 
-sed -i -e "s!_FIREFOX_BUILD_DIR_!${FIREFOX_BUILD_DIR}!g" .mozconfig
-
-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
+    sed -i -e "s!_FIREFOX_BUILD_DIR_!${FIREFOX_BUILD_DIR}!g" .mozconfig
 
-# Remove old links
-rm -f /usr/lib/mozilla
-rm -f /usr/lib/firefox
-rm -f /usr/lib/${FIREFOX_PKG_VERSION}/plugins/libjavaplugin_oji.so
+    make -f client.mk build
+    make -f client.mk install
 
-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/${FIREFOX_PKG_VERSION}/plugins
+    # Many applications look for netscape when they need to open a browser...
+    ln -v -sf firefox /usr/bin/netscape
 
-# Addition to /etc/ld.so.conf
-# This is necessary for shared library libmozjs.so (needed by gxine)
-string_add "/usr/lib/${FIREFOX_PKG_VERSION}" /etc/ld.so.conf
+    # Remove old links
+    rm -f /usr/lib/mozilla
+    rm -f /usr/lib/firefox
+    rm -f /usr/lib/${FIREFOX_PKG_VERSION}/plugins/libjavaplugin_oji.so
 
-ldconfig
+    ln -v -sf ${FIREFOX_PKG_VERSION} /usr/lib/mozilla
+    ln -v -sf ${FIREFOX_PKG_VERSION} /usr/lib/firefox
 
-exit $?
+    # Addition to /etc/ld.so.conf
+    # This is necessary for shared library libmozjs.so (needed by gxine)
+    string_add "/usr/lib/${FIREFOX_PKG_VERSION}" /etc/ld.so.conf
+}