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

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

Author: M0E.lnx
Date: Thu Jul 17 15:01:23 2008
New Revision: 48

Modified:
   branches/iVL/.lang/#project.pot
   branches/iVL/.lang/FrmDiskPart.pot
   branches/iVL/MdlCore.module
   branches/iVL/MdlDiskPart.module
   branches/iVL/MdlSetup.module

Log:
Modified win partition detection and cdrom drive detection.

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Thu Jul 17 15:01:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/.project
+# /home/moises/area-51/projects/installer/.project
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Thu Jul 17 15:01:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FrmDiskPart.class
+# /home/moises/area-51/projects/installer/FrmDiskPart.class
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Thu Jul 17 15:01:23 2008
@@ -121,12 +121,13 @@
   ClsGlobal.sSourceMnt = User.home &/ "mnt" &/ "cdrom"
   sMountPoint = ClsGlobal.sSourceMnt

-  sCmd = "sudo cat /proc/sys/dev/cdrom/info | grep \"drive name\" |cut 
-f 2 -d\':\'|xargs -n 2"
+  sCmd = "sudo cat /proc/sys/dev/cdrom/info | grep \"drive name\" |cut 
-f 2 -d\':\'|xargs -n 2 | sed -r \'s/ /\\n/g\'"
   SHELL sCmd TO sList
   sList = Trim(sList)
   'PRINT sList
-    IF InStr(sList, Space(1)) > 0 THEN 'there is more than one drive
-    sDrives = Split(sList, Space(1))
+    'IF InStr(sList, Space(1)) > 0 THEN 'there is more than one drive
+    IF InStr(sList, gb.newline) THEN ' More than one cd drive found
+    sDrives = Split(sList, gb.NewLine)

       FOR i = 0 TO sDrives.count - 1
         ' this is where we loop to find SETUP.CONF in the cd
@@ -170,7 +171,10 @@


             END IF
-          SHELL "sudo umount /dev/" & sDrive WAIT
+          'sHELL "sudo umount /dev/" & sDrive WAIT
+          SHELL "sudo umount " & ClsGlobal.sSourceMnt WAIT
+            CATCH
+              Message( ERROR )




Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module	(original)
+++ branches/iVL/MdlDiskPart.module	Thu Jul 17 15:01:23 2008
@@ -51,9 +51,10 @@
         aHandle = Desktop.Find(sTitle)
         INC i
       UNTIL
-      i = 10 OR aHandle.Count > 0
+      aHandle.Count > 0 OR i = 10
+      'i = 10 OR aHandle.Count > 0
         IF aHandle.Count = 0 THEN
-          Message("Setup is unable to successfully run gslapt on this 
system. This may be a sign of \n" &
+          Message("Setup is unable to successfully run gparted on this 
system. This may be a sign of \n" &
           "a bad install media. Setup cannot continue.")
         RETURN
         END IF
@@ -67,8 +68,9 @@

   'TRY embEmbedder.Embed(iHandle)
   TRY FrmDiskPart.EmbGPARTED.Embed(iHandle)
-
-  IF ERROR THEN Message.Warning(Error.Text)
+    CATCH
+      Message.Error(Error.text)
+  'IF ERROR THEN Message.Warning(Error.Text)

 END


Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Thu Jul 17 15:01:23 2008
@@ -22,6 +22,7 @@
   DIM sAddy AS String = Right(sDev, Len(sDev) - RInStr(sDev, "/"))


+  'message.info(sDev)
   IF sISONAME OR sISONAME <> "" THEN
      'SHELL "sudo mount " & sDev & " /mnt/loop" WAIT ' will switch 
places here .. the device will mount to loop and the iso will mount to 
the mount point
      SHELL "sudo mkdir -p /mnt" &/ sAddy & " && sudo mount " & sDev & 
Space(1) & "/mnt" &/ sAddy WAIT