X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage6%2Fhv-install-1;h=e78f7473630c1cd2b739fc98820b7cff1fb74020;hb=45c5a2f834c42e914e684c784988f369118aa31b;hp=379356f08d620389c2798985eb5174aac4a9a401;hpb=7426c3e50f8ebbd8df9cbe764e94677718f37345;p=hvlinux.git

diff --git a/stage6/hv-install-1 b/stage6/hv-install-1
index 379356f..e78f747 100755
--- a/stage6/hv-install-1
+++ b/stage6/hv-install-1
@@ -1,30 +1,17 @@
 #!/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 core packages
-##ipkg_gnome ${ORBIT2}
 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}
@@ -34,12 +21,6 @@ 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}
@@ -67,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}
@@ -91,15 +69,9 @@ 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}