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

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

Author: M0...@gm...
Date: Wed Dec  3 11:46:58 2008
New Revision: 354

Modified:
    branches/iVL/.lang/#project.pot
    branches/iVL/.lang/ClsGlobal.pot
    branches/iVL/.lang/ClsPartSel.pot
    branches/iVL/.lang/ClsWinDrives.pot
    branches/iVL/.lang/FMain.pot
    branches/iVL/.lang/FrmDiskPart.pot
    branches/iVL/.lang/FrmPartScheme.pot
    branches/iVL/.lang/FrmPartSel.pot
    branches/iVL/.lang/FrmPkgSel.pot
    branches/iVL/.lang/FrmSelISO.pot
    branches/iVL/.lang/FrmSummary.pot
    branches/iVL/.lang/FrmWinDrives.pot
    branches/iVL/.lang/MdlCore.pot
    branches/iVL/.lang/MdlDiskPart.pot
    branches/iVL/.lang/MdlObjSizer.pot
    branches/iVL/.lang/MdlPartSel.pot
    branches/iVL/.lang/MdlPkgSel.pot
    branches/iVL/.lang/MdlSetup.pot
    branches/iVL/.lang/MdlSummarize.pot
    branches/iVL/.lang/MdlWinDrives.pot
    branches/iVL/.project
    branches/iVL/FMain.class
    branches/iVL/FrmUserAdd.class
    branches/iVL/MdlConfLilo.module
    branches/iVL/MdlLilo.module
    branches/iVL/MdlSetup.module
    branches/iVL/installer.gambas

Log:
Fixed user account import module

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/.project
+# /home/vluser/devel/installer/.project
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsGlobal.class
+# /home/vluser/devel/installer/ClsGlobal.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot	(original)
+++ branches/iVL/.lang/ClsPartSel.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsPartSel.class
+# /home/vluser/devel/installer/ClsPartSel.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot	(original)
+++ branches/iVL/.lang/ClsWinDrives.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsWinDrives.class
+# /home/vluser/devel/installer/ClsWinDrives.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FMain.class
+# /home/vluser/devel/installer/FMain.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -94,19 +94,27 @@
  msgid "Skipping lilo setup"
  msgstr ""

-#: FMain.class:803
+#: FMain.class:489
+msgid "Setup has detected existing directories in the partition you  
selected for /home. Would you like to import these "
+msgstr ""
+
+#: FMain.class:489
+msgid "user accounts into your new Operating System"
+msgstr ""
+
+#: FMain.class:813
  msgid "Back"
  msgstr ""

-#: FMain.class:814
+#: FMain.class:824
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:825
+#: FMain.class:835
  msgid "Next"
  msgstr ""

-#: FMain.class:839
+#: FMain.class:849
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot	(original)
+++ branches/iVL/.lang/FrmPartScheme.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPartScheme.class
+# /home/vluser/devel/installer/FrmPartScheme.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot	(original)
+++ branches/iVL/.lang/FrmPartSel.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPartSel.class
+# /home/vluser/devel/installer/FrmPartSel.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot	(original)
+++ branches/iVL/.lang/FrmPkgSel.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPkgSel.class
+# /home/vluser/devel/installer/FrmPkgSel.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	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmSelISO.class
+# /home/vluser/devel/installer/FrmSelISO.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmSummary.class
+# /home/vluser/devel/installer/FrmSummary.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot	(original)
+++ branches/iVL/.lang/FrmWinDrives.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmWinDrives.class
+# /home/vluser/devel/installer/FrmWinDrives.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot	(original)
+++ branches/iVL/.lang/MdlCore.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlCore.module
+# /home/vluser/devel/installer/MdlCore.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot	(original)
+++ branches/iVL/.lang/MdlDiskPart.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlDiskPart.module
+# /home/vluser/devel/installer/MdlDiskPart.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot	(original)
+++ branches/iVL/.lang/MdlObjSizer.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlObjSizer.module
+# /home/vluser/devel/installer/MdlObjSizer.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot	(original)
+++ branches/iVL/.lang/MdlPartSel.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlPartSel.module
+# /home/vluser/devel/installer/MdlPartSel.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot	(original)
+++ branches/iVL/.lang/MdlPkgSel.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlPkgSel.module
+# /home/vluser/devel/installer/MdlPkgSel.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot	(original)
+++ branches/iVL/.lang/MdlSetup.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlSetup.module
+# /home/vluser/devel/installer/MdlSetup.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot	(original)
+++ branches/iVL/.lang/MdlSummarize.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlSummarize.module
+# /home/vluser/devel/installer/MdlSummarize.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot	(original)
+++ branches/iVL/.lang/MdlWinDrives.pot	Wed Dec  3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Wed Dec  3 11:46:58 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.26
+Version=0.1.30
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Wed Dec  3 11:46:58 2008
@@ -482,7 +482,17 @@
                  RETURN
        END IF
        FrmRootPass.Button1_Click()
-       frmNext = FrmUserAdd
+
+            ' Scan home partition for user home dirs
+            IF Len(MdlSetup.SCAN_HOME_DIRS(ClsGlobal.sTargetMnt  
&/ "home")) > 0 THEN
+                SELECT CASE Message.Question(("Setup has detected existing  
directories in the partition you selected for /home. Would you like to  
import these ") & "<br>" &
+                ("user accounts into your new Operating System"), ("Yes"),  
("No"))
+                  CASE 1
+                    frmNext = FrmImportAccts
+                  CASE 2
+                    frmNext = FrmUserAdd
+                END SELECT
+            END IF


      CASE "FrmUserAdd"

Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class	(original)
+++ branches/iVL/FrmUserAdd.class	Wed Dec  3 11:46:58 2008
@@ -32,6 +32,10 @@
    sDump = Trim(sDump)

    IF Len(sDump) > 0 THEN FrmUserAdd.btImportAcct.Enabled = TRUE
+    SELECT CASE Message.Question(("Setup has detected existing user  
directories in your selected /home partition. Would you like to import  
these user accounts into your new installation?"), ("Yes"), ("No"))
+      CASE 1
+      btImportAcct_Click()
+    END SELECT




Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Wed Dec  3 11:46:58 2008
@@ -95,6 +95,7 @@
    SHELL "chroot " & ClsGlobal.sTargetMnt & " /sbin/lilo -v || echo  
\'FAILED\' " TO sDump
      IF InStr(sDump, "FAILED") > 0 THEN
        Message.Error(("Lilo returned an error. Please see below") &  
gb.NewLine & sDump)
+      FMain.btnext.Enabled = TRUE
        RETURN 1
      ELSE
        Message(("Boot loader has been setup successfully"))

Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module	(original)
+++ branches/iVL/MdlLilo.module	Wed Dec  3 11:46:58 2008
@@ -144,10 +144,7 @@
    DIM cbox AS ComboBox
    DIM sLabel, sKernel, sInitrd, sAppend, sTag AS String
    DIM sBootPath, sHeader, sFile, sVidModeSection AS String
-
-
-
-
+
        FOR EACH cb IN arrLinuxIncCheckboxes
            IF Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1) =  
ClsPartSel.sRoot THEN
              sBootPath = "/boot"
@@ -165,7 +162,7 @@
                IF cb.Tag = cbox.Tag AND cbox.Text = ("None") THEN
                  sInitrd = "noinitrd"
                ELSE
-               sInitrd = Trim(cbox.Text) & "-" & Right(cbox.Tag,  
Len(cbox.Tag) - RInStr(cbox.tag, "/"))
+               sInitrd = sBootPath &/ Trim(cbox.Text) & "-" &  
Right(cbox.Tag, Len(cbox.Tag) - RInStr(cbox.tag, "/"))
                END IF
            NEXT
            FOR EACH tb IN arrLinuxAppendtxtBoxes
@@ -177,7 +174,7 @@
            "root = " & Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1)  
& "\n" &
            "label = " & sLabel & "\n" &
            "append = \"" & sAppend & "\"" & "\n" &
-          "initrd = " & sBootPath &/ sInitrd & "\n" &
+          "initrd = " & sInitrd & "\n" & ' sBootPath &/ sInitrd & "\n" &
            "read-only" & "\n"
                FOR EACH chbox IN ME.arrLinuxTextBoots
                  IF chbox.Value = TRUE THEN
@@ -192,7 +189,7 @@
            "root = " & Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1)  
& "\n" &
            "label = " & sLabel & "-tui" & "\n" &
            "append = \"2 splash=verbose\"" & "\n" &
-          "initrd = " & sBootPath &/ sInitrd & "\n" &
+          "initrd = " & sInitrd & "\n" & '& sBootPath &/ sInitrd & "\n" &
            "read-only" & "\n"
                        ' sClisection = sSection
                        ' sClisection = Replace(sClisection, "append = " &  
sAppend, "append = \"2 splash=verbose\"")
@@ -611,12 +608,13 @@
                                      .Width = 200
                                      .Height = 21
                                      .Tag = i & sHostPart
-                                     .Add(("None"))
+
                                              ' BROWSE FOR INITRD IMAGES

                                                  FOR EACH sDump IN  
Dir(sInitrdLoc, "initrd*").Sort(gb.Ascent)
                                                      IF  
cbox.Find(Trim(sDump)) = -1 THEN cbox.Add(Trim(sDump))
                                                  NEXT
+                                                .Add(("None"))
                                           .Sorted = gb.Ascent
                                           '.Sorted = TRUE
                                    END WITH

Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Wed Dec  3 11:46:58 2008
@@ -322,3 +322,14 @@

  END

+PUBLIC FUNCTION SCAN_HOME_DIRS(sHomePartition AS String) AS String
+
+  DIM sDump AS String
+    SHELL "ls " & sHomePartition & " | grep -v ftp | grep -v lost+found |  
grep -v .*" TO sDump
+
+    sDump = Trim(sDump)
+    RETURN sDump
+
+END
+
+

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.