Règle le bug:

[hvlinux.git] / stage6 / hv-install-1

diff --git a/stage6/hv-install-1 b/stage6/hv-install-1
index 84e4231..e78f747 100755 (executable)
--- a/stage6/hv-install-1
+++ b/stage6/hv-install-1
@@ -1,49 +1,26 @@
 #!/bin/bash
 
-# Reading system configuration informations, functions and package versions.
-source ../config/sysinfos
-source ../functions
-hvtrap_setup
-source ../config/packages-list
+source ../functions/main
 source /etc/profile
 
-if [ "x${USER}" != "xroot" ]; then
-    echo "You must be the superuser to install hvlinux."
-    exit 1
-fi
-
+check_for_root_user
 init_log_file
 
-# GNOME-2.X configuration
-#action_checkbox "Configuring ${GNOME2_VER}" ./cis-gnome-config
-#action_checkbox "Reloading /etc/profile" source /etc/profile
-
-# Gnome 2 core packages
-##ipkg_gnome ${ORBIT2}
+# Gnome core packages
 ipkg_gnome ${LIBBONOBO}
-###ipkg  ${GCONF} cis-gconf
 ipkg_gnome ${GNOME_MIME_DATA}
-####ipkg  ${GNOME_VFS} cis-gnome-nb
-####ipkg_gnome ${GNOME_VFS_MONIKERS}
 ipkg_gnome ${LIBGNOME}
 ipkg_gnome ${LIBGNOMECANVAS}
 ipkg_gnome ${LIBBONOBOUI}
-ipkg ${GNOME_ICON_THEME}
 ##ipkg_gnome ${GNOME_KEYRING}
 ipkg_gnome ${LIBGNOMEUI}
 ipkg ${GNOME_THEMES}
-ipkg -m acnb ${SCROLLKEEPER} "--localstatedir=/var --disable-static --with-omfdirs=/usr/share/omf:/opt/${GNOME2_VER}/share/omf"
+ipkg -m acnb ${SCROLLKEEPER} "--localstatedir=/var --disable-static --with-omfdirs=/usr/share/omf:/usr/share/omf"
 ipkg_gnome ${GNOME_DOC_UTILS}
 ipkg_gnome ${GNOME_DESKTOP}
 ipkg_gnome ${GNOME_BACKGROUNDS}
 ipkg_gnome ${GNOME_MENUS}
 ipkg_gnome ${GNOME_PANEL}
-ipkg    ${GSTREAMER}
-ipkg    ${GST_PLUGINS_BASE}
-ipkg    ${GST_PLUGINS_GOOD}
-ipkg    ${GST_PLUGINS_BAD}
-ipkg    ${GST_PLUGINS_UGLY}
-ipkg    ${GST_FFMPEG}
 ipkg    ${VTE} "--libexecdir=/usr/sbin --disable-gtk-doc"
 ipkg_gnome ${GNOME_TERMINAL}
 ipkg_gnome ${LIBGTOP}
@@ -71,17 +48,14 @@ ipkg -m gnomenb ${SYSTEM_TOOLS_BACKENDS}
 ipkg ${GNOME_AUDIO}
 
 # Gnome 2 additional packages - Utilities
-ipkg_gnome ${GEDIT} "--disable-spell"
 ipkg_gnome ${EOG}
 
 ipkg ${LIBSPECTRE}
-ipkg_gnome ${EVINCE}
 ipkg_gnome ${FILE_ROLLER}
 ipkg_gnome ${GCONF_EDITOR}
 ipkg_gnome ${GNOME_UTILS}
 ipkg_gnome ${GNOME_SYSTEM_MONITOR}
 ipkg_gnome ${NAUTILUS_CD_BURNER}
-ipkg_gnome ${GNOME_MEDIA}
 ipkg_gnome ${GNOME_NETSTATUS}
 ipkg -m gnomenb ${GCALCTOOL}
 ipkg_gnome ${GUCHARMAP}
@@ -95,16 +69,13 @@ ipkg ${LIBMUSICBRAINZ}
 ipkg_gnome ${GNOME_SOUND_JUICER}
 ipkg_gnome ${GNOME_TOTEM}
 ipkg ${GDM}
-ipkg ${LIBNOTIFY}
 
 ipkg ${RHYTHMBOX} "--disable-python"
 
-ipkg ${LIBGSF}
-ipkg -m acnb ${GOFFICE}
-ipkg ${GNUMERIC}
-ipkg ${WV}
-ipkg ${ABIWORD}  "--disable-spellcheck"
 ipkg_gnome ${EVOLUTION} "--with-nss-includes=/usr/include/nss --with-nspr-includes=/usr/include/nspr --with-openldap=yes --with-krb5=/usr"
 ipkg_gnome ${EVOLUTION_EXCHANGE}
 
+write_completed_stage
+display_stage_build_stats
+
 exit $?