[Vectorlinux-devel] [vinstall-ng commit] r266 - in branches/iVL: . .lang

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

Author: M0E.lnx
Date: Thu Nov  6 09:16:12 2008
New Revision: 266

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/.lang/FrmSelISO.pot
    branches/iVL/.lang/FrmSummary.pot
    branches/iVL/DevLog
    branches/iVL/FrmSelISO.class
    branches/iVL/MdlInstallCustom.module

Log:
- Implemented new package listing for custom installation


Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Thu Nov  6 09:16:12 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /home/remote/devel/installer/FMain.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot	(original)
+++ branches/iVL/.lang/FrmSelISO.pot	Thu Nov  6 09:16:12 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSelISO.class
+# /home/remote/devel/installer/FrmSelISO.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -31,7 +31,7 @@
  msgstr ""

  #: FrmSelISO.class:82
-msgid "Installable media found."
+msgid "Select installation media from the list below"
  msgstr ""

  #: FrmSelISO.class:113

Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Thu Nov  6 09:16:12 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /home/remote/devel/installer/FrmSummary.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog	(original)
+++ branches/iVL/DevLog	Thu Nov  6 09:16:12 2008
@@ -1,2 +1 @@
-- Fixed EXEC line that triggers when installer is done
-- Fixed duplicate "During this process" in message.wrarning before setting  
up X
+- Implemented new package listing for custom installation

Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class	(original)
+++ branches/iVL/FrmSelISO.class	Thu Nov  6 09:16:12 2008
@@ -79,7 +79,7 @@
      FMain.btnext.ForeColor = Color.Gray
      FMain.btback.ForeColor = Color.Gray
      ELSE
-      tlBanner.text = "<b>" & ("Installable media found.") & "</b>"
+      tlBanner.text = "<b>" & ("Select installation media from the list  
below") & "</b>"
        WITH FMain
          .btback.Enabled = FALSE
            .btback.ForeColor = Color.Gray

Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Thu Nov  6 09:16:12 2008
@@ -248,7 +248,7 @@
  PUBLIC FUNCTION INSTALL_USER_PACKAGES() AS Integer

    DIM ii, i, iStepTotal AS Integer
-  DIM sBasePath AS String = ClsGlobal.sTargetMnt &/ "packages"
+  DIM sBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"
    DIM sLoc, spkg, sDump AS String

    ' get the step total by running though the list and comparing pictures
@@ -269,9 +269,18 @@
        sPkg = FrmUsrPkgSel.GridView1[ii, 5].Text
        INC i
          ' install this package
-        EXEC ["echo", " ", " > /tmp/installdump"] WAIT
+        EXEC ["echo \" \" > /tmp/installdump"] WAIT
            FrmInstallSys.tlCurrPkg.Text = ("Installing") & Space(1) &  
FrmUsrPkgSel.GridView1[ii, 1].Text
-              hproc = EXEC ["installpkg", sBasePath &/ sLoc &/ sPkg, "  
-R ", ClsGlobal.sTargetMnt, " || echo \'FAILED\' 2> /tmp/installdump"]
+                FrmInstallSys.pbInstallProg.Value = i / iStepTotal
+          INC iPkgNum
+          FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, 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"]
+              'hproc = EXEC ["installpkg " & sBasePath &/ sLoc &/ sPkg & "  
-R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump"]
+              'hproc = EXEC ["installpkg", sBasePath &/ sLoc &/  
sPkg, "-R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>  
/tmp/installdump"] WAIT
+              'hproc = EXEC ["installpkg " & sBasePath &/ sLoc &/ sPkg &  
Space(1) & "-R" & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>  
/tmp/installdump"] WAIT
+              hproc = SHELL "installpkg " & sBasePath &/ sLoc &/ sPkg &  
Space(1) & "-R" & Space(1) & ClsGlobal.sTargetMnt & Space(1) & "|| echo  
\'FAILED\' 2> /tmp/installdump" 'WAIT
                      WAIT 1
                      IF hproc.State = Process.Running THEN
                        REPEAT
@@ -280,8 +289,9 @@
                    END IF
            sDump = File.Load("/tmp/installdump")

-          INC i
-          FrmInstallSys.pbInstallProg.Value = i / iStepTotal
+          'INC i
+
+
              IF InStr(sDump, "FAILED") > 0 THEN
                    Message.Error("Error installing user-selected package" &  
Space(1) & sPkg)
                    RETURN 1
@@ -503,7 +513,7 @@

  PUBLIC SUB CALCULATE_TOTAL_PACKAGES()

-  DIM i AS Integer
+  DIM i, ii AS Integer
    DIM irs AS Integer
    DIM sOutput AS String
    DIM sOutArr AS String[]
@@ -563,7 +573,7 @@
          ' ' ' ' ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
          ' ' ' ' ' ' '   IF cb.Value = TRUE THEN INC irs
          ' ' ' ' ' ' '
-        NEXT
+'        NEXT
        i = i + irs ' the count to the total
    'i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count
    iPkgCnt = i
@@ -636,10 +646,12 @@
      sDesc = Replace(sDesc, "\'", "")
    vSize = Trim(CStr(vSize))
    sDump = ""
-  SHELL "echo \"\" > /tmp/installdump" WAIT
+  'SHELL "echo \" \" > /tmp/installdump" WAIT
+  EXEC ["echo \" \" > /tmp/installdump"] WAIT
    sErr = ""
    IF vSize <> "" THEN
      SHELL "gsize=$(df| grep " & ClsGlobal.sTargetMnt & " ) && echo $gsize  
| cut -f3 -d \' \'" TO vTargetSize
+'    EXEC ["gzise=$(df | grep " & ClsGlobal.sTargetMnt & ") && echo $gzise  
| cut -f3 -d \' \'"] TO vTargetSize
    END IF
    FrmInstallSys.pbInstallProg.Value = 0
    INC iPkgNum