bootdisk/trunk/batch-installer/ui/ui-wizard

[hawk]

Author: hawk
Date: Sun Feb  5 18:24:51 2006
New Revision: 6928

Modified:
   bootdisk/trunk/batch-installer/ui/ui-wizard
Log:
- list package sets in specified order
- updated installation types descriptions


Modified: bootdisk/trunk/batch-installer/ui/ui-wizard
==============================================================================
--- bootdisk/trunk/batch-installer/ui/ui-wizard	(original)
+++ bootdisk/trunk/batch-installer/ui/ui-wizard	Sun Feb  5 18:24:51 2006
@@ -875,6 +875,10 @@
 }
 
 display_profile () {
+  local pkgsets
+
+  pkgsets=`cat $pkgsetsdir/.list`
+
   if [ "$last_pkg_set" = "" ] ; then
     # if /etc/installer.pkgs contains basic pkgset, we can select it
     # or mini-iso, otherwise config was loaded from disk or created
@@ -889,6 +893,7 @@
     else
       last_pkg_set=$pkgsetsdir/LAST
       cp $pkgsfile $last_pkg_set
+      pkgsets="$pkgsets LAST"
     fi
   fi
   echo "<meta active=pkg_set>"
@@ -899,56 +904,55 @@
   else
     echo "<menu height=12 id=pkg_set selected='$last_pkg_set' res=1002>"
   fi
-  for f in $pkgsetsdir/* ; do
-    name=$(basename $f)
+  for name in $pkgsets ; do
     if [ "$name" = CVS ] ; then
       continue
     fi
     if test -f /tmp/is-mini-iso && [ "$name" != MINI-ISO ] && [ "$name" != minimal ] && [ "$name" != LAST ] ; then
       continue
     fi
-    echo "<item id=$f>_$name"
+    echo "<item id=$name>_$name"
     size=$(nls "unknown")
     desc1=$(nls "Group %s" "$name")
     desc2=
     case "$name" in
       minimal )
-        desc1=$(nls "Just very basic packages.")
+        desc1=$(nls "Just very basic packages")
 	desc2=$(nls "Don't select unless you're doing embedded system")
-	size=$(nls '70MB without docs, one locale')
+	size=$(nls '57MB without docs, one locale')
 	;;
       base )
-        desc1=$(nls "Base PLD Linux installation.")
-	size=$(nls '186MB with default set of packages')
+        desc1=$(nls "Base PLD Linux installation")
+	size=$(nls '221MB with default set of packages')
         ;;
       devel )
-        desc1=$(nls "Base PLD Linux installation + basic development packages.")
-	size=$(nls '328MB with default set of packages')
+        desc1=$(nls "Base PLD Linux installation + basic development packages")
+	size=$(nls '387MB with default set of packages')
         ;;
       server )
         desc1=$(nls "Server installation with most of services and daemons")
-	size=$(nls '254MB with default set of packages')
+	size=$(nls '297MB with default set of packages')
         ;;
       gnome-workstation )
         desc1=$(nls "X workstation running GNOME")
-	size=$(nls '406MB with default set of packages')
+	size=$(nls '505MB with default set of packages')
 	;;
       kde-workstation )
         desc1=$(nls "X workstation running KDE")
-	size=$(nls '368MB with default set of packages')
+	size=$(nls '477MB with default set of packages')
 	;;
       icewm-workstation )
         desc1=$(nls "X workstation running IceWM")
-	size=$(nls '264MB with default set of packages')
+	size=$(nls '349MB with default set of packages')
 	;;
       wmaker-workstation )
         desc1=$(nls "X workstation running WindowMaker")
-	size=$(nls '268MB with default set of packages')
+	size=$(nls '365MB with default set of packages')
 	;;
       MINI-ISO )
-        desc1=$(nls "Base packages + ppp, poldek.")
-	desc2=$(nls "Select this if you're installing from MINI-ISO.")
-	size=$(nls '122MB with docs, all locales')
+        desc1=$(nls "Limited version of base installation")
+	desc2=$(nls "Select this if you're installing from MINI-ISO")
+	size=$(nls '157MB with docs, all locales')
 	;;
       LAST )
         desc1=$(nls "Packages, you have selected last time.")
@@ -966,9 +970,9 @@
 
 post_profile () {
   if [ "$res" = 1002 -a "$pkg_set" != "$last_pkg_set" ] ; then
-    cp $pkg_set $pkgsfile
+    cp $pkgsetsdir/$pkg_set $pkgsfile
     if [ "$pkg_set" != LAST ] ; then
-      cp $pkg_set $pkgsetsdir/LAST
+      cp $pkgsetsdir/$pkg_set $pkgsetsdir/LAST
     fi
     last_pkg_set=$pkg_set
   fi