[Vectorlinux-devel] [vinstall-ng commit] r82 - branches/iVL

[<cod...@go...>]

Author: uelsk8s
Date: Fri Jul 25 19:11:26 2008
New Revision: 82

Modified:
   branches/iVL/FMain.class
   branches/iVL/MdlInstallSys.module
   branches/iVL/MdlPartFrmt.module
   branches/iVL/MdlSetup.module

Log:
additions to install_required_packages and start of liloconf

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Fri Jul 25 19:11:26 2008
@@ -29,7 +29,8 @@
 PUBLIC SUB Form_Open()
 DIM iImg AS Image
 ME.Maximized = TRUE
-MdlCore.LOCK_GUI()
+MdlCore.LOCK_GUI
+'MdlCore.LOCK_GUI()
 ClsGlobal.sBackNav = NEW Object[]
 ClsGlobal.sSourceMnt = "/mnt" &/ "cdrom"
 FrmSelISO.Reparent(ME.pnlWinHost)

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Fri Jul 25 19:11:26 2008
@@ -199,6 +199,7 @@
       ME.PERFORM_FULL_INSTALL()
         're-direct to packages for now
          FrmInstallSys.tlCurrPkg.Text = "Installing Additional 
software... Please wait"
+      ME.INSTALL_REQUIRED_PACKAGES()
       ME.INSTALL_PACKAGES()
     END IF

@@ -273,8 +274,8 @@
         sLine = Trim(sFile[i])

           IF Left(sLine, Len("BULK") + 1) LIKE "BULK" & "*[0-9]*" THEN
-            'sLine = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
-            'sLine = Left(sLine, Len(sLine) - 1)
+            sLine = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
+            sLine = Left(sLine, Len(sLine) - 1)
               sPak = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
               sPak = Left(sPak, Len(sPak) - 1)
               sEntry = Split(sPak, ":")
@@ -449,9 +450,9 @@
     DIM sTlzBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"

     'sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT"))
-
-      'sFile = Split(sRawFile, "\n")
-       sFile = SHELL "ls /mnt/cdrom/packages/required/*.t?z"
+     SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sRawFile
+      sFile = Split(sRawFile, "\n")
+        'SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sFile
         FOR i = 0 TO sFile.count - 1
           sLine = Trim(sFile[i])
             'IF Left(sLine, Len("PACKAGE NAME")) = "PACKAGE NAME" THEN
@@ -460,9 +461,12 @@
                'sTlzPath = Right(sTlzPath, Len(sTlzPath) - 2) ' remove 
the ./ from the location line
             'END IF
           ' now install the package with the information we already have
+          PRINT sTlzName & sTlzPath
               sDump = ""
               sErr = ""
-              hproc = SHELL "install-pkg " & sTlzBasePath &/ sTlzPath 
&/ sTlzName & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\'" 
FOR READ
+              FrmInstallSys.tlCurrPkg.Text = "Installing " & sTlzName & " ..."
+              FrmInstallSys.pbInstallProg.Value = 0.0
+              hproc = SHELL "install-pkg " & sTlzName & Space(1) & 
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
                 WAIT 1
                   IF hproc.State = Process.Running THEN
                     REPEAT

Modified: branches/iVL/MdlPartFrmt.module
==============================================================================
--- branches/iVL/MdlPartFrmt.module	(original)
+++ branches/iVL/MdlPartFrmt.module	Fri Jul 25 19:11:26 2008
@@ -45,11 +45,13 @@
       IF ClsPartSel.sVar THEN
         sList.Add(ClsPartSel.sVar & ";" & ClsPartSel.fVar)
       END IF
-
+  FrmInstallSys.tlBanner.Text = "Formatting partitions"
   ' now that we have the list in the array, let's do each one
   FOR i = 0 TO sList.Count - 1
     sPart = Left(sList[i], InStr(sList[i], ";") - 1)
     sFormat = Right(sList[i], Len(sList[i]) - InStr(sList[i], ";"))
+      FrmInstallSys.tlBanner.Text = "Formatting " & sPart & " with " & sFormat
+      WAIT 1
       iretval = MdlPartFrmt.FORMAT_PARTITION(sPart, sFormat) ' do the formatting
         IF iretval <> 0 THEN
           RETURN ' stop right there there's been an error.
@@ -140,14 +142,14 @@

     PRINT "Formatting " & sAddr & " to " & sFS
   hproc = SHELL sCommand & " || echo \'FAILED\'" WAIT 'for read
-    WAIT
+    WAIT 2
       IF hproc.State = Process.Running THEN
         REPEAT
    '        FrmHostPrep.tlStatus.Text = "Formatting " & sAddr & " as " 
& sFS

            FrmInstallSys.tlCurrPkg.Text = " Formatting " & sAddr & " 
as " & sFS

-          WAIT
+          WAIT 1
         UNTIL
           hproc.State = Process.Stopped
       sDump = Trim(sDump)

Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Fri Jul 25 19:11:26 2008
@@ -177,6 +177,9 @@
        SHELL "cat " & ClsGlobal.sSourceMnt &/ "packages" 
&/ "PACKAGES.TXT | grep ^\"PACKAGE NAME\"" TO sDump
         sTotalList = sTotalList & gb.NewLine & Trim(sDump)
         sDump = ""
+        SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sDump
+        sTotalList = sTotalList & gb.NewLine & Trim(sDump)
+        sDump = ""
         ' split the array
           sList = Split(sTotalList, "\n")
             FOR i = 0 TO sList.Count - 1