-Amélioré fonctions de download des packages

[hvlinux.git] / stage5 / pkg / gnome-config

diff --git a/stage5/pkg/gnome-config b/stage5/pkg/gnome-config
index fd88e27..a8d18e8 100644 (file)
--- a/stage5/pkg/gnome-config
+++ b/stage5/pkg/gnome-config
@@ -1,43 +1,35 @@
-#!/bin/sh
-# First argument of this script is the package name
-
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
-
-# For Gnome 2 variables
-var_add_path "PATH" /etc/profile "/opt/${GNOME2_VER}/bin" &&
-var_export   "PATH" /etc/profile &&
-var_add_path "PKG_CONFIG_PATH" /etc/profile "/opt/${GNOME2_VER}/lib/pkgconfig" &&
-var_add_path "PKG_CONFIG_PATH" /etc/profile "/opt/${GNOME2_VER}/share/pkgconfig" &&
-var_export   "PKG_CONFIG_PATH" /etc/profile &&
-var_add_path "LIBGLADE_MODULE_PATH" /etc/profile "${GNOME2_PREFIX}/lib/libglade/2.0" &&
-var_export   "LIBGLADE_MODULE_PATH" /etc/profile &&
-var_add_path "XDG_CONFIG_DIRS" /etc/profile "/etc/gnome/${GNOME2_VER}/xdg" &&
-var_export   "XDG_CONFIG_DIRS" /etc/profile &&
-
-# For Gnome 1 and 2 common variable
-var_add_path "GNOME_LIBCONFIG_PATH" /etc/profile "/usr/lib" &&
-var_export   "GNOME_LIBCONFIG_PATH" /etc/profile &&
-
-string_add "/opt/${GNOME2_VER}/lib" /etc/ld.so.conf &&
-
-var_add_path "MANPATH" /etc/profile "/opt/${GNOME2_VER}/man" &&
-var_export   "MANPATH" /etc/profile &&
-
-# There is a third mechanism for customizing the search path. If a
-# `dirlist' file exists in acdir, then that file is assumed to contain a
-# list of directories, one per line, to be added to the search list. These
-# directories are searched after all other directories.
-touch /usr/share/aclocal/dirlist &&
-string_add "/opt/${GNOME2_VER}/share/aclocal" /usr/share/aclocal/dirlist &&
-
-cat > /etc/skel/.gtkrc-2.0 << "EOF" &&
+#!/bin/bash
+
+hvbuild()
+{
+    # For Gnome 2 variables
+    var_add_path "PATH" /etc/profile "/opt/${GNOME2_VER}/bin"
+    var_export   "PATH" /etc/profile
+    var_add_path "PKG_CONFIG_PATH" /etc/profile "/opt/${GNOME2_VER}/lib/pkgconfig"
+    var_add_path "PKG_CONFIG_PATH" /etc/profile "/opt/${GNOME2_VER}/share/pkgconfig"
+    var_export   "PKG_CONFIG_PATH" /etc/profile
+    var_add_path "LIBGLADE_MODULE_PATH" /etc/profile "${GNOME2_PREFIX}/lib/libglade/2.0"
+    var_export   "LIBGLADE_MODULE_PATH" /etc/profile
+    var_add_path "XDG_CONFIG_DIRS" /etc/profile "/etc/gnome/${GNOME2_VER}/xdg"
+    var_export   "XDG_CONFIG_DIRS" /etc/profile
+
+    # For Gnome 1 and 2 common variable
+    var_add_path "GNOME_LIBCONFIG_PATH" /etc/profile "/usr/lib"
+    var_export   "GNOME_LIBCONFIG_PATH" /etc/profile
+
+    string_add "/opt/${GNOME2_VER}/lib" /etc/ld.so.conf
+
+    var_add_path "MANPATH" /etc/profile "/opt/${GNOME2_VER}/man"
+    var_export   "MANPATH" /etc/profile
+
+    # There is a third mechanism for customizing the search path. If a
+    # `dirlist' file exists in acdir, then that file is assumed to contain a
+    # list of directories, one per line, to be added to the search list. These
+    # directories are searched after all other directories.
+    touch /usr/share/aclocal/dirlist
+    string_add "/opt/${GNOME2_VER}/share/aclocal" /usr/share/aclocal/dirlist
+
+    cat > /etc/skel/.gtkrc-2.0 << "EOF"
 gtk-icon-theme-name="Tango"
 EOF
-
-ldconfig
-
-# Return last error
-exit $?
+}