vectorlinux-devel

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

Author: uelsk8s
Date: Wed Nov 19 19:28:54 2008
New Revision: 305

Modified:
    branches/iVL/.project
    branches/iVL/FMain.class
    branches/iVL/FrmLiloSetup.class
    branches/iVL/MdlInstallCustom.module
    branches/iVL/MdlInstallSys.module
    branches/iVL/MdlLilo.module
    branches/iVL/MdlNetConf.module
    branches/iVL/MdlSetup.module

Log:
fixed progress bar bug

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Wed Nov 19 19:28:54 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.0.200
+Version=0.0.209
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug
@@ -17,6 +17,7 @@
  Language=en_US
  ControlPublic=1
  ModulePublic=1
+ExecPath=/root/gui-installer2/installer.gambas
  Maintainer=M0E-lnx
  Vendor=VectorLinux
  Address=M0...@gm...

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Wed Nov 19 19:28:54 2008
@@ -413,7 +413,8 @@
      'POST INSTALL CONFIGURATION
      CASE "FrmInstallSys"
        MdlInstallSys.WRITE_NEW_DISTRO_ID()
-      MdlConfLilo.PERFORM_BINDING()
+      'moved binding to end of install in MdlInstallCustom.INSTALL_KERNELS
+      'MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for system  
config
        'frmNext = FrmLilo
        frmNext = FrmLiloSetup


Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class	(original)
+++ branches/iVL/FrmLiloSetup.class	Wed Nov 19 19:28:54 2008
@@ -45,6 +45,8 @@
    ME.CLEANUP_TABSTRIP()
    MdlLilo.LIST_DEFAULT_BOOT_OPTIONS() ' initial list
    FMain.btnext.Enabled = TRUE
+  ME.cbVideoRes.text = "Bootsplash High"
+  ME.cbBootDefault.Text = "VectorLinux"
  END

  PUBLIC SUB CLEANUP_TABSTRIP()

Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Wed Nov 19 19:28:54 2008
@@ -24,7 +24,7 @@
  PRIVATE sDump AS String
  PRIVATE sErr AS String
  'PRIVATE iPkgCnt AS Integer
-PRIVATE iPkgNum AS Integer
+'PRIVATE iPkgNum AS Integer


  PUBLIC SUB PERFORM_CUSTOM_INSTALL()
@@ -41,26 +41,26 @@
    'ME.CALCULATE_TOTAL_PACKAGES()
      'RETURN
    WAIT 2
-  iRet = ME.INSTALL_REQUIRED_BULKS()
    PRINT " INSTALLING REQUIRED BULKS"
+  iRet = ME.INSTALL_REQUIRED_BULKS()
    IF iRet <> 0 THEN
      'exit this is an error
       Message.Error(("There as been an error while installing required  
system software. ") & gb.newline & sErr)
       RETURN
    END IF

+  PRINT "INSTALING USER-SELECTED BULKS"
    iRet = ME.INSTALL_USER_SELECTED_BULKS()
    'Message("Installing user-selected bulks")
-  PRINT "INSTALING USER-SELECTED BULKS"
    IF iRet <> 0 THEN
      Message.Error(("There has been an error while installing optional  
software to your system. ") & gb.newline & sErr)
      RETURN
    END IF

    'iret = ME.INSTALL_USER_SELECTED_PACKAGES()
+  PRINT "INSTALLING OPTIONAL SOFTWARE SELECTED BY USER"
    iret = ME.INSTALL_USER_PACKAGES() ' new code based on the gridview
      'Message("Installing user-selected packages")
-  PRINT "INSTALLING OPTIONAL SOFTWARE SELECTED BY USER"
    IF iRet <> 0 THEN
      Message.Error(("There has been an error while installing optional  
software to your system.") & gb.newline & sErr)
      RETURN
@@ -70,9 +70,8 @@
    ' Make sure we set the right value for the progress bar here
      'MdlInstallSys.iPkgCnt = iPkgCnt
      'MdlInstallSys.iPkgNum = iPkgNum
-  iret = MdlInstallSys.INSTALL_REQUIRED_PACKAGES()
    PRINT "INSTALLING ADDITIONAL REQUIRED SOFTWARE"
-
+  iret = MdlInstallSys.INSTALL_REQUIRED_PACKAGES()
    IF iret <> 0 THEN
      Message.Error(("Error while installing required system software. ") &  
gb.NewLine & sErr)
      RETURN
@@ -80,20 +79,28 @@

    'iret = ME.INSTALL_CONF_PACKAGES()
      '/ USE THE FUNCTION IN MDLINSTALLSYS.MODULE DOES THE EXACT SAME THING  
AND HAS PROGRESS UPDATING
-    iret = MdlInstallSys.INSTALL_CONFIG_PACKAGES()
    PRINT "INSTALLING CONFIGURATION PACKAGES"
+  iret = MdlInstallSys.INSTALL_CONFIG_PACKAGES()
    IF iret <> 0 THEN
      Message.Error(("Error while installing system configuration. ") &  
gb.NewLine & sErr)
      RETURN
    END IF

-  iret = ME.INSTALL_KERNELS()
    PRINT "INSTALLING KERNELS"
+  iret = ME.INSTALL_KERNELS()
    IF iret <> 0 THEN
      Message.Error(("Unable to install kernels. ") & gb.NewLine & sErr)
      RETURN
    END IF

+  PRINT "Binding and config"
+  MdlConfLilo.PERFORM_BINDING()
+  'iret = MdlConfLilo.PERFORM_BINDING()
+  'IF iret <> 0 THEN
+  '  Message.Error(("Unable to Bind Mount. ") & gb.NewLine & sErr)
+  '  RETURN
+  'END IF
+
    ' write new fstab now
     MdlInstallSys.WRITE_NEW_FSTAB()

@@ -197,8 +204,8 @@
          EXEC ["echo \" \" > /tmp/installdump"] WAIT
            FrmInstallSys.tlCurrPkg.Text = ("Installing") & Space(1) &  
FrmUsrPkgSel.GridView1[ii, 1].Text
                  FrmInstallSys.pbInstallProg.Value = i / iStepTotal
-          INC iPkgNum
-          FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
+          INC ClsGlobal.iPkgNum
+          FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, ClsGlobal.iPkgNum)

                'hproc = EXEC ["installpkg", sBasePath &/ sLoc &/ sPkg, "  
-R ", ClsGlobal.sTargetMnt, " || echo \'FAILED\' 2> /tmp/installdump"]
                'hproc = EXEC ["installpkg -R " & ClsGlobal.sTargetMnt &  
Space(1) & sBasePath &/ sLoc &/ sPkg & " || echo \'FAILED\' 2>  
/tmp/installdump"]
@@ -275,9 +282,9 @@
              ' update step progress
              INC i
                FrmInstallSys.pbInstallProg.Value = i / iStepTotal
-            INC iPkgNum
+            INC ClsGlobal.iPkgNum
                'MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
-              FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
+              FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, ClsGlobal.iPkgNum)
                  'IF InStr(sDump, "FAILED") > 0 THEN
                  IF hproc.Value > 0 THEN
                    Message.Error("Error installing user-selected package" &  
Space(1) & cb.Text)
@@ -389,7 +396,7 @@
  '    EXEC ["gzise=$(df | grep " & ClsGlobal.sTargetMnt & ") && echo $gzise  
| cut -f3 -d \' \'"] TO vTargetSize
    END IF
    FrmInstallSys.pbInstallProg.Value = 0
-  INC iPkgNum
+  INC ClsGlobal.iPkgNum
    PRINT " Installing " & sBulkPath
          MdlSetup.SHOW_PROGRESS_CONTROLS()
    FrmInstallSys.tlCurrPkg.Text = "Installing " & File.Name(sBulkPath)
@@ -406,7 +413,7 @@
          FrmInstallSys.tlCurrPkg.Text = Trim(sDesc)
        IF vSize <> "" THEN
          'MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),  
CFloat(vSize))
-        MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, vSize, iPkgNum)
+        MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, vSize,  
ClsGlobal.iPkgNum)

          FrmInstallSys.pbInstallProg2.Value =  
(FrmInstallSys.pbInstallProg2.Value + (ClsGlobal.fPbInc - (ClsGlobal.fPbInc  
* FrmInstallSys.pbInstallProg.Value)) / 100)
        END IF
@@ -420,7 +427,7 @@
        ' ' ' IF InStr(sDump, "FAILED") > 0 THEN
        ' ' '   RETURN 1
        ' ' ' ELSE
-        FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
+        FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, ClsGlobal.iPkgNum)
        RETURN 0
      END IF
  '  END IF
@@ -441,8 +448,8 @@
      SHELL "gsize=$(df| grep " & ClsGlobal.sTargetMnt & " ) && echo $gsize  
| cut -f3 -d \' \'" TO vTargetSize
    END IF
    FrmInstallSys.pbInstallProg.Value = 0
-  INC iPkgNum
-  PRINT "Package " & iPkgNum & " of " & ClsGlobal.iPkgTot
+  INC ClsGlobal.iPkgNum
+  PRINT "Package " & ClsGlobal.iPkgNum & " of " & ClsGlobal.iPkgTot
    MdlSetup.SHOW_PROGRESS_CONTROLS()
    FrmInstallSys.tlCurrPkg.Text = "Processing " & File.Name(sPackagePath)
    'hproc = SHELL "install-pkg " & sPackagePath & Space(1) &  
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
@@ -457,7 +464,7 @@
      ' do the progress bar updating here
      IF vSize <> "" THEN
        'MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),  
CFloat(vSize))
-      MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, CInt(vSize), iPkgNum)
+      MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, CInt(vSize),  
ClsGlobal.iPkgNum)

      END IF
      UNTIL
@@ -472,7 +479,7 @@
        ELSE
          FrmInstallSys.pbInstallProg.Value = 1
          WAIT
-        FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
+        FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, ClsGlobal.iPkgNum)
          RETURN 0
        END IF
    END IF

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Wed Nov 19 19:28:54 2008
@@ -315,21 +315,22 @@
      ClsGlobal.iPkgTot = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
      'Message.Info("Total packages = " & iPkgCnt)
      PRINT "Total packages to be installed " & ClsGlobal.iPkgTot
+
      PRINT "Installing bulks"
      MdlSetup.SHOW_PROGRESS_CONTROLS()
-
      iret = ME.INSTALL_BULK_PACKAGES()
    IF iret <> 0 THEN
      PRINT "Error installing bulks ... exit"
      RETURN
    END IF
+
    PRINT "installing packages"
-
    iret = ME.INSTALL_PACKAGES_NEW()
      IF iret <> 0 THEN
        PRINT "error installing packages ... exit"
        RETURN
      END IF
+
      PRINT "Installing packages/required"
      'MdlSetup.SHOW_PROGRESS_CONTROLS()
    iret = ME.INSTALL_REQUIRED_PACKAGES()
@@ -337,9 +338,9 @@
        PRINT "Error installing packages/required ... exit"
        RETURN
      END IF
+
      PRINT "installing CONFIG packages from SETUP.CONF"
      'MdlSetup.SHOW_PROGRESS_CONTROLS()
-
    iret = ME.INSTALL_CONFIG_PACKAGES()
        IF iret <> 0 THEN
          PRINT "Error installing config packages ... exit"
@@ -353,6 +354,14 @@
        RETURN
      END IF

+  PRINT "Binding and config"
+  MdlConfLilo.PERFORM_BINDING()
+  'iret = MdlConfLilo.PERFORM_BINDING()
+  'IF iret <> 0 THEN
+  '  Message.Error(("Unable to Bind Mount. ") & gb.NewLine & sErr)
+  '  RETURN
+  'END IF
+
      ' WRITE THE FSTAB NOW
    MdlInstallSys.WRITE_NEW_FSTAB()
    FrmInstallSys.pbInstallProg.Value = 1
@@ -751,7 +760,7 @@

  PUBLIC FUNCTION INSTALL_REQUIRED_PACKAGES() AS Integer

-    DIM i AS Integer
+    DIM i, ii AS Integer
      DIM sList AS String[]
      DIM sRawList AS String
      'DIM sRawFile AS String
@@ -782,7 +791,12 @@
                ' clear the dump
                'SHELL "echo \' \' > /tmp/installdump" WAIT
                'EXEC "echo", " ", "/tmp/installdump"] WAIT
-              FrmInstallSys.tlCurrPkg.Text = ("Installing Required  
Package ...") & sTlzName
+              IF i > iTlzTotal THEN
+                ii = iTlzTotal
+              ELSE
+                ii = (i + 1)
+              ENDIF
+              FrmInstallSys.tlCurrPkg.Text = ("Installing Required  
Package ...") & ii & " of " & iTlzTotal 'sTlzName
                'hproc = SHELL "installpkg " & sTlzPath & " -R " &  
ClsGlobal.sTargetMnt & " || echo \'FAILED\'"
                hproc = EXEC ["installpkg", sTlzPath, "-R",  
ClsGlobal.sTargetMnt]
                'hproc = exec  
["installpkg",sTlzPath,"-R",ClsGlobal.sTargetMnt
@@ -804,7 +818,7 @@


              INC ClsGlobal.iPkgNum
-            FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
+            FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, ClsGlobal.iPkgNum)


              'Message(sTlzPath & "<br>" & sTlzName)
@@ -851,7 +865,7 @@
        hproc.State = Process.Stopped
      END IF
      INC ClsGlobal.iPkgNum
-    FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
+    'FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
      'END IF
      sDump = File.Load("/tmp/installdump")
      IF InStr(sDump, "FAILED") > 0 THEN

Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module	(original)
+++ branches/iVL/MdlLilo.module	Wed Nov 19 19:28:54 2008
@@ -31,7 +31,8 @@

    ME.GENERATE_LILO_DOT_CONF ' Generates and write lilo.conf
    ME.COPY_KERNELS_AND_INITRDS ' copy kernels and initrs to the right place
-  MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for LILO setup
+  'Moved binding to FMain.class right after packages finish installing.
+  'MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for LILO setup
    MdlConfLilo.EXECUTE_LILO() ' Execute lilo in chroot mode


@@ -176,7 +177,7 @@
                  IF chbox.Value = TRUE THEN
                      IF chbox.tag = cb.Tag THEN
                        sClisection = sSection
-                      sClisection = Replace(sClisection, "append = " &  
sAppend, "append = 2 splash=verbose vga=791")
+                      sClisection = Replace(sClisection, "append = " &  
sAppend, "append = \"2 splash=verbose\"")
                        sClisection = Replace(sClisection, "label = " &  
sLabel, "label = " & sLabel & "-cli") & "\n"
                      ELSE
                        sClisection = ""
@@ -299,7 +300,7 @@

  END IF
  NEXT
-EXEC ["umount", "/mnt/target"] WAIT
+'EXEC ["umount", "/mnt/target"] WAIT
  END



Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module	(original)
+++ branches/iVL/MdlNetConf.module	Wed Nov 19 19:28:54 2008
@@ -72,10 +72,10 @@
      objIntTypes = NEW Object[]


-    SHELL "export res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo  
\"$res\" | tr -s \' \'" TO seths
+    'SHELL "export res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo  
\"$res\" | tr -s \' \'" TO seths
        'File.Save(Temp("eths"), Trim(seths))
        'Message(File.Load(Temp("eths")))
-
+
        seths = Trim(seths)

        IF seths = "" THEN

Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Wed Nov 19 19:28:54 2008
@@ -192,6 +192,7 @@
      SHELL "find " & ClsGlobal.sSourceMnt & "/veclinux -name \"*.tlz\"|wc  
-l" TO ClsGlobal.iBulkCnt
      'find packages
      SHELL "find " & ClsGlobal.sSourceMnt & "/packages -name  \"*.tlz\"|wc  
-l" TO ClsGlobal.iPkgCnt
+    ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + 1
      ClsGlobal.iPkgTot = ClsGlobal.iBulkCnt + ClsGlobal.iPkgCnt
      PRINT ClsGlobal.iPkgTot
    ELSE ' GOING FOR CUSTOM INSTALL
@@ -223,8 +224,8 @@
      IF InStr(sOutput, "\n") > 0 THEN
        sOutArr = Split(sOutput, "\n")
        i = i + sOutArr.Count
-      'add config bulks to ClsGlobal.iPkgCnt cause they are small and at  
the end
-      ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + sOutArr.Count
+      'add config bulks to ClsGlobal.iBulkCnt
+      ClsGlobal.iBulkCnt = ClsGlobal.iBulkCnt + sOutArr.Count
      ELSE
        i = i + 1
        'add config bulks to ClsGlobal.iPkgCnt cause they are small and at  
the end
@@ -248,8 +249,8 @@
        UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count
      i = i + irs ' the count to the total
      'add pkgs TO ClsGlobal.iPkgCnt
-    ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + irs
-    ClsGlobal.iPkgTot = i
+    ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + irs + 1
+    ClsGlobal.iPkgTot = i + 1
    END IF
    PRINT ("Total bulks to be installed = ") & ClsGlobal.iBulkCnt
    ClsGlobal.fPbInc = 0.6 / ClsGlobal.iBulkCnt