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

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

Author: M0...@gm...
Date: Thu Dec 11 12:59:41 2008
New Revision: 392

Modified:
    branches/iVL/.project
    branches/iVL/FrmImportAccts.class
    branches/iVL/FrmUserAdd.class
    branches/iVL/MdlSetup.module
    branches/iVL/MdlUsrAdd.module
    branches/iVL/installer.gambas

Log:
Debugged user add

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Dec 11 12:59:41 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.26
+Version=0.1.28
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class	(original)
+++ branches/iVL/FrmImportAccts.class	Thu Dec 11 12:59:41 2008
@@ -58,8 +58,8 @@

    SELECT CASE Message.Question(("Would you like to continue adding new  
user accounts now?"), ("Yes"), ("No"))
      CASE 1
-      FrmUserAdd.Reparent(FMain.pnlwinhost)
        MdlUsrAdd.LIST_NEW_USER_ACCOUNT()
+      FrmUserAdd.Reparent(FMain.pnlwinhost)
        FrmUserAdd.Show()
        ME.Close()
      CASE ELSE

Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class	(original)
+++ branches/iVL/FrmUserAdd.class	Thu Dec 11 12:59:41 2008
@@ -95,6 +95,11 @@
      END IF
      FMain.btnext.Enabled = TRUE
      ME.tbUsername.SetFocus
+
+    IF Exist(clsglobal.sTargetMnt &/ "etc" &/ "passwd") THEN
+      MdlUsrAdd.LIST_NEW_USER_ACCOUNT()
+    END IF
+
  END



Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Thu Dec 11 12:59:41 2008
@@ -346,16 +346,18 @@
    IF NOT ClsPartSel.sHome THEN RETURN ""
    IF ClsPartSel.sRoot = ClsPartSel.sHome THEN RETURN ""

-    SHELL "ls " & sHomePartition & " | grep / | grep -v ftp | grep -v  
lost+found" TO sDump
+    'SHELL "ls " & sHomePartition & " | grep / | grep -v ftp | grep -v  
lost+found" TO sDump
+    SHELL "ls -d " & sHomePartition &/ "*/" & " | grep -v gtp | grep -v  
lost+found" TO sDump
+

      sDump = Trim(sDump)

      IF Len(sDump) > 0 THEN
-      RETURN 1
+      RETURN 1 ' user dirs are found
      ELSE
      FrmUserAdd.btImportAcct.Enabled = FALSE
      FrmUserAdd.btImportAcct.ForeColor = Color.Gray
-      RETURN 0
+      RETURN 0 ' no dirs found

      END IF


Modified: branches/iVL/MdlUsrAdd.module
==============================================================================
--- branches/iVL/MdlUsrAdd.module	(original)
+++ branches/iVL/MdlUsrAdd.module	Thu Dec 11 12:59:41 2008
@@ -45,6 +45,7 @@
                sUsrHome = arrline[5]
            NEXT
          IF iUID >= 500 THEN
+          IF Exist(clsglobal.sTargetMnt &/ sUsrHome) THEN
            tl = NEW TextLabel(FrmUserAdd.LstUsers) AS "UserList"
                WITH tl
                    .Height = 21
@@ -55,6 +56,7 @@
                    .Move(0, tly)
                END WITH
                tly = tly + tl.Height + 2
+          END IF
            END IF
    NEXT


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