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

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

Author: uelsk8s
Date: Thu Jul 31 18:25:06 2008
New Revision: 96

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/FrmLicense.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/MdlInstallCustom.module
   branches/iVL/MdlInstallSys.module
   branches/iVL/install-pkg
   branches/iVL/installer.gambas

Log:
fixed custom install progress meters

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/.project
+# /root/svn-installer2/.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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsGlobal.class
+# /root/svn-installer2/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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsPartSel.class
+# /root/svn-installer2/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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsWinDrives.class
+# /root/svn-installer2/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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FMain.class
+# /root/svn-installer2/FMain.class
 # 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 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmDiskPart.class
+# /root/svn-installer2/FrmDiskPart.class
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot	(original)
+++ branches/iVL/.lang/FrmLicense.pot	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmLicense.class
+# /root/svn-installer2/FrmLicense.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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartScheme.class
+# /root/svn-installer2/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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartSel.class
+# /root/svn-installer2/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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPkgSel.class
+# /root/svn-installer2/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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSelISO.class
+# /root/svn-installer2/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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSummary.class
+# /root/svn-installer2/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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmWinDrives.class
+# /root/svn-installer2/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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlCore.module
+# /root/svn-installer2/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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlDiskPart.module
+# /root/svn-installer2/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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlObjSizer.module
+# /root/svn-installer2/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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /root/svn-installer2/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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPkgSel.module
+# /root/svn-installer2/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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /root/svn-installer2/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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSummarize.module
+# /root/svn-installer2/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	Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlWinDrives.module
+# /root/svn-installer2/MdlWinDrives.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Jul 31 18:25:06 2008
@@ -1,7 +1,7 @@
 # Gambas Project File 2.0
 Title=VectorLinux Installer
 Startup=MdlCore
-Version=0.0.29
+Version=0.0.30
 Library=gb.gtk
 Library=gb.form
 Library=gb.debug
@@ -16,7 +16,7 @@
 Language=en_US
 ControlPublic=1
 ModulePublic=1
-ExecPath=/home/uel/svn-installer/installer.gambas
+ExecPath=/root/svn-installer2/installer.gambas
 Maintainer=benoit
 Vendor=Princeton
 Address=benoit@localhost

Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Thu Jul 31 18:25:06 2008
@@ -28,122 +28,120 @@
 PUBLIC SUB PERFORM_CUSTOM_INSTALL()

   DIM iRet AS Integer = 0
-
   WITH FMain
       .tvPlan["Inst2"].Selected = TRUE
       .tvPlan["Inst2"].Picture = MdlCore.sNowPic
       .tvPlan["Inst1"].Picture = MdlCore.sDonePic
-    END WITH
-
-
+  END WITH
   ME.CALCULATE_TOTAL_PACKAGES()
     'RETURN
-
-    WAIT 2
-    iRet = ME.INSTALL_REQUIRED_BULKS()
-        PRINT " INSTALLING 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
-    iRet = ME.INSTALL_USER_SELECTED_BULKS()
-      PRINT "INSTALING USER-SELECTED BULK PACKAGES"
-      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"
-      IF iRet <> 0 THEN
-        Message.Error("There has been an error while installing 
optional software to your system. " & gb.newline &
-        sErr)
-        RETURN
-      END IF
+  WAIT 2
+  iRet = ME.INSTALL_REQUIRED_BULKS()
+  PRINT " INSTALLING 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
+
+  iRet = ME.INSTALL_USER_SELECTED_BULKS()
+  PRINT "INSTALING USER-SELECTED BULK PACKAGES"
+  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"
+  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_PACKAGES_REQUIRED()
-      PRINT "INSTALLING ADDITIONAL REQUIRED SOFTWARE"
-      IF iret <> 0 THEN
-        Message.Error("Error while installing required system 
software. " & gb.NewLine & sErr)
-        RETURN
-      END IF
-    iret = ME.INSTALL_CONF_PACKAGES()
-        PRINT "INSTALLING CONFIGURATION PACKAGES"
-      IF iret <> 0 THEN
-        Message.Error("Error while installing system configuration. " 
& gb.NewLine & sErr)
-        RETURN
-      END IF
+  iret = ME.INSTALL_PACKAGES_REQUIRED()
+  PRINT "INSTALLING ADDITIONAL REQUIRED SOFTWARE"
+  IF iret <> 0 THEN
+    Message.Error("Error while installing required system software. " 
& gb.NewLine & sErr)
+    RETURN
+  END IF
+
+  iret = ME.INSTALL_CONF_PACKAGES()
+  PRINT "INSTALLING CONFIGURATION 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"
-      IF iret <> 0 THEN
-        Message.Error("Unable to install kernels. " & gb.NewLine & sErr)
-      RETURN
-      END IF
-      ' write new fstab now
-      MdlInstallSys.WRITE_NEW_FSTAB()
-  ' Installation complete....
-  Message("Vectorlinux is now installed on your system . Enjoy!")
+  PRINT "INSTALLING KERNELS"
+  IF iret <> 0 THEN
+    Message.Error("Unable to install kernels. " & gb.NewLine & sErr)
+    RETURN
+  END IF

-
+  ' write new fstab now
+   MdlInstallSys.WRITE_NEW_FSTAB()

+  ' Installation complete....
+  FrmInstallSys.pbInstallProg.Value = 1
+  FrmInstallSys.pbInstallProg2.Value = 1
+  Message("Vectorlinux is now installed on your system . Enjoy!")
+  WITH FMain
+    .btQuit.Enabled = TRUE
+    .btQuit.ForeColor = Color.Black
+  END WITH
+  'MdlCore.unlock_gui()
 END

+
 PUBLIC FUNCTION INSTALL_KERNELS() AS Integer
+  ' Dont know if I should install all kernels, but for the lack of 
information now, I will
+  DIM sKerNames AS String
+  DIM sKernels AS String[]
+  DIM sKenVs AS String[]
+  DIM sKernVers AS String
+  DIM sKernNo AS String
+  DIM sKrnLbl AS String
+  DIM sFoundOut AS String
+  DIM sKernName AS String
+  DIM sLabel AS String
+  DIM sKernelPath AS String
+  DIM i AS Integer
+  ClsGlobal.sSourceMnt = "/mnt/cdrom"

-    ' Dont know if I should install all kernels, but for the lack of 
information now, I will
-
-    DIM sKerNames AS String
-    DIM sKernels AS String[]
-    DIM sKenVs AS String[]
-    DIM sKernVers AS String
-    DIM sKernNo AS String
-    DIM sKrnLbl AS String
-    DIM sFoundOut AS String
-    DIM sKernName AS String
-    DIM sLabel AS String
-    DIM sKernelPath AS String
-    DIM i AS Integer
-    ClsGlobal.sSourceMnt = "/mnt/cdrom"
-        SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" 
&/ "SETUP.CONF | grep ^ISO_KERNEL_" TO sKernames
-        SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" 
&/ "SETUP.CONF | grep ^HD_KERNEL_" TO sKernVers
-    sKernames = Trim(sKernames)
-    sKernVers = Trim(sKernVers)
-        sKernels = Split(sKernames, "\n")
-          FOR i = 0 TO sKernels.Count - 1
-            sKrnLbl = Trim(sKernels[i])
-              'sKernNo = Left(sKrnLbl, InStr(sKrnLbl, "="))
-              sKernNo = Left(sKrnLbl, InStr(sKrnLbl, "=") - 1)
-              sKernNo = Trim(sKernNo)
-              sLabel = Right(sKrnLbl, Len(sKrnLbl) - InStr(sKrnLbl, "\'"))
-                sLabel = Left(sLabel, RInStr(sLabel, "\'") - 1)
-
-                sKernNo = Right(sKernNo) ' this is the number of the kernel
-                  SHELL " cat " & ClsGlobal.sSourceMnt &/ "veclinux" 
&/ "SETUP.CONF | grep ^HD_KERNEL_" & sKernNo TO sFoundOut
-                    sFoundOut = Trim(sFoundOut)
-                      sKernName = Right(sFoundOut, Len(sFoundOut) - InStr(sFoundOut, "\'"))
-                      sKernName = Left(sKernName, 
RInStr(sKernName, "\'") - 1)
-                      'Message.Info(sLabel & " - " & sKernName)
-
-              ' now copy the kernel to the right place
-                sKernelPath = ClsGlobal.sSourceMnt &/ "isolinux" 
&/ "kernel" &/ sLabel
-                  IF Exist(sKernelPath) THEN
-                    sDump = ""
-                    sErr = ""
-                    hproc = SHELL "cp " & sKernelPath & Space(1) & 
ClsGlobal.sTargetMnt &/ "boot" &/ "vmlinuz-" & sKernName FOR READ
-                        WAIT 3
-                        IF InStr(sDump, "FAILED") > 0 THEN
-                          RETURN 1
-                        ELSE
-                          RETURN 0
-                        END IF
-
-                  END IF
-                'SHELL "cp " & ClsGlobal.sSourceMnt &/ "isolinux" 
&/ "kernel" &/
-          NEXT
-
-
+  SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF | 
grep ^ISO_KERNEL_" TO sKernames
+  SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF | 
grep ^HD_KERNEL_" TO sKernVers
+  sKernames = Trim(sKernames)
+  sKernVers = Trim(sKernVers)
+  sKernels = Split(sKernames, "\n")
+  FOR i = 0 TO sKernels.Count - 1
+    sKrnLbl = Trim(sKernels[i])
+    'sKernNo = Left(sKrnLbl, InStr(sKrnLbl, "="))
+    sKernNo = Left(sKrnLbl, InStr(sKrnLbl, "=") - 1)
+    sKernNo = Trim(sKernNo)
+    sLabel = Right(sKrnLbl, Len(sKrnLbl) - InStr(sKrnLbl, "\'"))
+    sLabel = Left(sLabel, RInStr(sLabel, "\'") - 1)
+    sKernNo = Right(sKernNo) ' this is the number of the kernel
+    SHELL " cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
 grep ^HD_KERNEL_" & sKernNo TO sFoundOut
+    sFoundOut = Trim(sFoundOut)
+    sKernName = Right(sFoundOut, Len(sFoundOut) - InStr(sFoundOut, "\'"))
+    sKernName = Left(sKernName, RInStr(sKernName, "\'") - 1)
+    'Message.Info(sLabel & " - " & sKernName)
+     'now copy the kernel to the right place
+     sKernelPath = ClsGlobal.sSourceMnt &/ "isolinux" &/ "kernel" &/ sLabel
+     IF Exist(sKernelPath) THEN
+       sDump = ""
+       sErr = ""
+       hproc = SHELL "cp " & sKernelPath & Space(1) & 
ClsGlobal.sTargetMnt &/ "boot" &/ "vmlinuz-" & sKernName FOR READ
+       WAIT 3
+       IF InStr(sDump, "FAILED") > 0 THEN
+         RETURN 1
+       ELSE
+         RETURN 0
+       END IF
+     END IF
+     'SHELL "cp " & ClsGlobal.sSourceMnt &/ "isolinux" &/ "kernel" &/
+  NEXT
 END


@@ -153,172 +151,145 @@
   DIM i, iret AS Integer
   DIM sList, sLinearr AS String[]

-
-    SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF | 
grep ^CONF" TO sOutput
-        sOutput = Trim(sOutput)
-          IF InStr(sOutput, "\n") > 0 THEN
-            sList = Split(sOutput, "\n")
-              FOR i = 0 TO sList.Count - 1
-                sLine = sList[i]
-                sPkg = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
-                sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
-                sLinearr = Split(sPkg, ":")
-                sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
-                  ' install it now
-                    PRINT " + Install " & sPkgPath
-                  'iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
-                  iret = ME.INSTALL_THIS_BULK(sPkgPath)
-                      IF iret <> 0 THEN
-                        RETURN iret
-                      END IF
-                  PRINT " ! " & sPkgPath & " is installed"
-
-              NEXT
-        ELSE ' single CONF line
-        sPkg = Right(sOutput, Len(sOutput) - InStr(sOutput, "\'"))
-        sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
-            sLinearr = Split(sPkg, ":")
-            sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
-              'iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
-              iret = ME.INSTALL_THIS_BULK(sPkgPath)
-                IF iret <> 0 THEN
-                  RETURN iret
-                END IF
-
-        END IF
-
-
-
+  SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF | 
grep ^CONF" TO sOutput
+  sOutput = Trim(sOutput)
+  IF InStr(sOutput, "\n") > 0 THEN
+    sList = Split(sOutput, "\n")
+    FOR i = 0 TO sList.Count - 1
+      sLine = sList[i]
+      sPkg = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
+      sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
+      sLinearr = Split(sPkg, ":")
+      sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
+      ' install it now
+      PRINT " + Install " & sPkgPath
+      'iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
+      iret = ME.INSTALL_THIS_BULK(sPkgPath)
+      IF iret <> 0 THEN
+        RETURN iret
+      END IF
+      PRINT " ! " & sPkgPath & " is installed"
+    NEXT
+  ELSE ' single CONF line
+    sPkg = Right(sOutput, Len(sOutput) - InStr(sOutput, "\'"))
+    sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
+    sLinearr = Split(sPkg, ":")
+    sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
+    'iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
+    iret = ME.INSTALL_THIS_BULK(sPkgPath)
+    IF iret <> 0 THEN
+      RETURN iret
+    END IF
+  END IF
 END


-
 PUBLIC FUNCTION INSTALL_PACKAGES_REQUIRED() AS Integer

   DIM i, iRet AS Integer
   DIM sPkg AS String

-    FOR EACH sPkg IN RDir(ClsGlobal.sSourceMnt &/ "packages" &/ "required")
-      SELECT CASE File.Ext(ClsGlobal.sSourceMnt &/ "packages" 
&/ "required" &/ sPkg)
-        CASE "tlz", "tgz"
-                PRINT " + Install " & ClsGlobal.sSourceMnt 
&/ "packages" &/ "required" &/ sPkg
-            iret = ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt 
&/ "packages" &/ "required" &/ sPkg)
-              IF iret <> 0 THEN
-                RETURN iret
-              END IF
-                PRINT " ! " & ClsGlobal.sSourceMnt &/ "packages" 
&/ "required" &/ sPkg & " is installed"
-      END SELECT
-    NEXT
-
-
+  FOR EACH sPkg IN RDir(ClsGlobal.sSourceMnt &/ "packages" &/ "required")
+    SELECT CASE File.Ext(ClsGlobal.sSourceMnt &/ "packages" 
&/ "required" &/ sPkg)
+    CASE "tlz", "tgz"
+      PRINT " + Install " & ClsGlobal.sSourceMnt &/ "packages" 
&/ "required" &/ sPkg
+      iret = ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt 
&/ "packages" &/ "required" &/ sPkg)
+      IF iret <> 0 THEN
+        RETURN iret
+      END IF
+      PRINT " ! " & ClsGlobal.sSourceMnt &/ "packages" &/ "required" 
&/ sPkg & " is installed"
+    END SELECT
+  NEXT
 END


-
 PUBLIC FUNCTION INSTALL_USER_SELECTED_PACKAGES() AS Integer

   DIM i, iret AS Integer
   DIM sPkg AS String
   DIM sPkgPath AS String = ClsGlobal.sSourceMnt &/ "packages"
-      FOR i = 0 TO ClsPkgSel.arrPkgs.count - 1
-        sPkg = ClsPkgSel.arrPkgs[i]
-            PRINT " + Install " & sPkgPath &/ sPkg
-          iret = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
-              IF iret <> 0 THEN
-                RETURN iret
-              END IF
-                PRINT " ! " & sPkgPath &/ sPkg & " is installed"
-      NEXT
-

+  FOR i = 0 TO ClsPkgSel.arrPkgs.count - 1
+    sPkg = ClsPkgSel.arrPkgs[i]
+    PRINT " + Install " & sPkgPath &/ sPkg
+    iret = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
+    IF iret <> 0 THEN
+      RETURN iret
+    END IF
+    PRINT " ! " & sPkgPath &/ sPkg & " is installed"
+  NEXT
 END


-
-
 PUBLIC FUNCTION INSTALL_USER_SELECTED_BULKS() AS Integer

   DIM SPkg AS String
   DIM sPkgPath AS String = ClsGlobal.sSourceMnt &/ "veclinux"
   DIM i AS Integer
   DIM iRet AS Integer
-      FOR i = 0 TO ClsPkgSel.arrBulks.Count - 1
-        sPkg = ClsPkgSel.arrBulks[i]
-          'install the packages now
-                PRINT " + Install " & sPkgPath &/ sPkg
-            'iRet = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
-            iret = ME.INSTALL_THIS_BULK(sPkgPath &/ sPkg)
-              IF iRet <> 0 THEN
-                RETURN 1
-                END IF
-              PRINT " ! " & sPkgPath &/ sPkg & " is installed"
-      NEXT
-
+
+  FOR i = 0 TO ClsPkgSel.arrBulks.Count - 1
+    sPkg = ClsPkgSel.arrBulks[i]
+    'install the packages now
+    PRINT " + Install " & sPkgPath &/ sPkg
+    'iRet = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
+    iret = ME.INSTALL_THIS_BULK(sPkgPath &/ sPkg)
+    IF iRet <> 0 THEN
+      RETURN 1
+    END IF
+    PRINT " ! " & sPkgPath &/ sPkg & " is installed"
+  NEXT
 END


-
-
-
 PUBLIC SUB CALCULATE_TOTAL_PACKAGES()

-    DIM i AS Integer
-    DIM sOutput AS String
-    DIM sOutArr AS String[]
+  DIM i AS Integer
+  DIM sOutput AS String
+  DIM sOutArr AS String[]

-    'MdlPkgSel.GET_USER_BULK_SELECTION()
-    'MdlPkgSel.GET_USER_PKG_SELECTION()
-        'Message.Info(ClsPkgSel.arrBulks.Count & " from selected 
bulks" & "<br>" &
-        'ClsPkgSel.arrPkgs.Count & " from selected packages")
-        'RETURN
-    PRINT "Calculating package count ... Please wait"
-      SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" 
&/ "SETUP.CONF" & " | grep ^BULK | grep required" TO sOutput
-          sOutput = Trim(sOutput)
-            IF InStr(sOutput, "\n") > 0 THEN
-              sOutArr = Split(sOutput, "\n")
-              i = i + sOutArr.Count
-            ELSE
-              i = i + 1
-            END IF
-            'Message.Info(i & " from required bulks")
-            'RETURN
-' count required packages in
-      sOutArr.Clear
-      sOutput = ""
-      SHELL "ls -m " & ClsGlobal.sSourceMnt &/ "packages" 
&/ "required" &/ "*.t?z" TO sOutput
-      sOutput = Trim(sOutput)
-
-        sOutArr = Split(sOutput, ",")
-        i = i + sOutArr.Count
-      'Message(i & " from packages/required")
-' Count CONF packages in
-    sOutArr.Clear
-    sOutput = ""
-          SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" 
&/ "SETUP.CONF" & " | grep ^CONF" TO sOutput
-            sOutput = Trim(sOutput)
-            IF InStr(sOutput, "\n") > 0 THEN
-              sOutArr = Split(sOutput, "\n")
-              i = i + sOutArr.Count
-            ELSE
-              i = i + 1
-            END IF
-' Count user-selected stuff in
+  'MdlPkgSel.GET_USER_BULK_SELECTION()
+  'MdlPkgSel.GET_USER_PKG_SELECTION()
+  'Message.Info(ClsPkgSel.arrBulks.Count & " from selected bulks" 
& "<br>" &
+  'ClsPkgSel.arrPkgs.Count & " from selected packages")
+  'RETURN
+  PRINT "Calculating package count ... Please wait"
+  SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" 
& " | grep ^BULK | grep required" TO sOutput
+  sOutput = Trim(sOutput)
+  IF InStr(sOutput, "\n") > 0 THEN
+    sOutArr = Split(sOutput, "\n")
+    i = i + sOutArr.Count
+  ELSE
+    i = i + 1
+  END IF
+  'Message.Info(i & " from required bulks")
+  'RETURN
+  'count required packages in
+  sOutArr.Clear
+  sOutput = ""
+  SHELL "ls -m " & ClsGlobal.sSourceMnt &/ "packages" &/ "required" 
&/ "*.t?z" TO sOutput
+  sOutput = Trim(sOutput)
+  sOutArr = Split(sOutput, ",")
+  i = i + sOutArr.Count
+  'Message(i & " from packages/required")
+  'Count CONF packages in
+  sOutArr.Clear
+  sOutput = ""
+  SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" 
& " | grep ^CONF" TO sOutput
+  sOutput = Trim(sOutput)
+  IF InStr(sOutput, "\n") > 0 THEN
+    sOutArr = Split(sOutput, "\n")
+    i = i + sOutArr.Count
+  ELSE
+    i = i + 1
+  END IF
+  'Count user-selected stuff in
   i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count
   iPkgCnt = i
-
   PRINT "Total packages to be installed = " & i
-
-
-
-
 END


-
-
-
-
-
 PUBLIC FUNCTION INSTALL_REQUIRED_BULKS() AS Integer

   DIM sOutput AS String
@@ -330,94 +301,81 @@
   DIM sBUlkDesc AS String
   DIM iRet AS Integer

-
-    SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" 
& " | grep ^BULK | grep required" TO sOutput
-      sOutput = Trim(sOutput)
-        IF InStr(sOutput, gb.NewLine) THEN
-          sList = Split(sOutput, gb.NewLine)
-                    'iPkgCnt = iPkgCnt + sList.Count ' add these to 
the overall package count.
-            FOR i = 0 TO sList.count - 1
-              sTrimmed = Right(sList[i], Len(sList[i]) - InStr(sList[i], "\'"))
-              sTrimmed = Left(sTrimmed, RInStr(sTrimmed, "\'") - 1)
-              '              sTrimmed = Left(sTrimmed, Len(sTrimmed) - RInStr(sTrimmed, "\'"))
-                  sLine = Split(sTrimmed, ":")
-                  sBulk = sLine[0]
-                  sBUlkDesc = sLine[2]
-                        ' do the sizing
-
-                      PRINT " + install " & ClsGlobal.sSourceMnt 
&/ "veclinux" &/ sBulk
-                    'iRet = 
ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulk)
-                    iret = ME.INSTALL_THIS_BULK(ClsGlobal.sSourceMnt 
&/ "veclinux" &/ sBulk)
-
-                      IF iRet <> 0 THEN
-                        ' error... stop
-                          PRINT "Error while installing " & sBulk & " 
-> " & sBUlkDesc
-                        RETURN 1
-
-                      END IF
-                        PRINT " ! " & ClsGlobal.sSourceMnt 
&/ "veclinux" &/ sBulk & " is installed"
-            NEXT
-        ELSE ' found only one line
-              iPkgCnt = iPkgCnt + 1 ' add only one to the overall 
package count
-          sTrimmed = Right(sOutput, Len(sOutput) - InStr(sOutput, "\'"))
-          sTrimmed = Left(sTrimmed, Len(sTrimmed) - RInStr(sTrimmed, "\'"))
-            sLine = Split(sTrimmed, ":")
-              sBulk = sLine[0]
-              sBUlkDesc = sLine[2]
-                iRet = ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt 
&/ "veclinux" &/ sBulk)
-                  IF iRet <> 0 THEN
-                        ' error... stop
-                          PRINT "Error while installing " & sBulk & " 
-> " & sBUlkDesc
-                        RETURN 1
-
-                      END IF
-
-      END IF
+  SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" 
& " | grep ^BULK | grep required" TO sOutput
+  sOutput = Trim(sOutput)
+  IF InStr(sOutput, gb.NewLine) THEN
+    sList = Split(sOutput, gb.NewLine)
+    'iPkgCnt = iPkgCnt + sList.Count ' add these to the overall 
package count.
+    FOR i = 0 TO sList.count - 1
+      sTrimmed = Right(sList[i], Len(sList[i]) - InStr(sList[i], "\'"))
+      sTrimmed = Left(sTrimmed, RInStr(sTrimmed, "\'") - 1)
+      'sTrimmed = Left(sTrimmed, Len(sTrimmed) - RInStr(sTrimmed, "\'"))
+      sLine = Split(sTrimmed, ":")
+      sBulk = sLine[0]
+      sBUlkDesc = sLine[2]
+      PRINT " + install " & ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulk
+      'iRet = ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt 
&/ "veclinux" &/ sBulk)
+      iret = ME.INSTALL_THIS_BULK(ClsGlobal.sSourceMnt &/ "veclinux" 
&/ sBulk)
+      IF iRet <> 0 THEN
+        ' error... stop
+        PRINT "Error while installing " & sBulk & " -> " & sBUlkDesc
+        RETURN 1
+      END IF
+      PRINT " ! " & ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulk & " is installed"
+    NEXT
+  ELSE ' found only one line
+    iPkgCnt = iPkgCnt + 1 ' add only one to the overall package count
+    sTrimmed = Right(sOutput, Len(sOutput) - InStr(sOutput, "\'"))
+    sTrimmed = Left(sTrimmed, Len(sTrimmed) - RInStr(sTrimmed, "\'"))
+    sLine = Split(sTrimmed, ":")
+    sBulk = sLine[0]
+    sBUlkDesc = sLine[2]
+    iRet = ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt &/ "veclinux" 
&/ sBulk)
+    IF iRet <> 0 THEN
+      ' error... stop
+      PRINT "Error while installing " & sBulk & " -> " & sBUlkDesc
+      RETURN 1
+    END IF
+  END IF
 END


-
-
 PUBLIC FUNCTION INSTALL_THIS_BULK(sBulkPath AS String) AS Integer

   DIM vSize AS Variant
   DIM vTargetSize AS Variant
-    SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF | 
grep " & File.Name(sBulkPath) & " | cut -f 2 -d :" TO vSize
-    vSize = Trim(CStr(vSize))
-
-    sDump = ""
-    sErr = ""
+
+  SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF | 
grep " & File.Name(sBulkPath) & " | cut -f 2 -d :" TO vSize
+  vSize = Trim(CStr(vSize))
+  sDump = ""
+  sErr = ""
+  IF vSize <> "" THEN
+    SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " ) && echo 
$gsize | cut -f3 -d \' \'" TO vTargetSize
+  END IF
+  FrmInstallSys.pbInstallProg.Value = 0
+  INC iPkgNum
+  PRINT " Installing " & sBulkPath
+  MdlSetup.SHOW_PROGRESS_CONTROLS()
+  FrmInstallSys.tlCurrPkg.Text = "Installing " & File.Name(sBulkPath)
+  hproc = SHELL "lzmadec <" & sBulkPath & " | tar -xp -C " & 
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+  WAIT 1
+  IF hproc.State = Process.Running THEN
+    WAIT 1
+    REPEAT
+      WAIT 1
+      ' do the progress updating here
       IF vSize <> "" THEN
-        SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " ) && 
echo $gsize | cut -f3 -d \' \'" TO vTargetSize
+        MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vSize))
       END IF
-
-      INC iPkgNum
-      PRINT " Installing " & sBulkPath
-      MdlSetup.SHOW_PROGRESS_CONTROLS()
-      FrmInstallSys.tlCurrPkg.Text = "Installing " & File.Name(sBulkPath)
-        hproc = SHELL "lzmadec <" & sBulkPath & " | tar -xp -C " & 
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
-          WAIT 1
-            IF hproc.State = Process.Running THEN
-              WAIT 1
-                REPEAT
-                  WAIT 1
-                ' do the progress updating here
-                  IF vSize <> "" THEN
-                    FrmInstallSys.pbInstallProg2.Value = 
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
-                    
MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vSize))
-                  END IF
-                UNTIL
-                  hproc.State = Process.Stopped
-              IF InStr(sDump, "FAILED") > 0 THEN
-                RETURN 1
-              ELSE
-                RETURN 0
-              END IF
-            END IF
-
-
-
-
+    UNTIL
+      hproc.State = Process.Stopped
+      IF InStr(sDump, "FAILED") > 0 THEN
+        RETURN 1
+      ELSE
+        FrmInstallSys.pbInstallProg2.Value = 
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+      RETURN 0
+    END IF
+  END IF
 END


@@ -428,39 +386,37 @@
   sDump = ""
   sErr = ""

-      SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF  
| grep " & File.Name(sPackagePath) & " | cut -f 2 -d :" TO vSize
-          IF vSize <> "" THEN
-            SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " ) 
&& echo $gsize | cut -f3 -d \' \'" TO vTargetSize
-          END IF
-
-
-    INC iPkgNum
-    PRINT "Package " & iPkgNum & " of " & iPkgCnt
-    MdlSetup.SHOW_PROGRESS_CONTROLS()
-    FrmInstallSys.tlCurrPkg.Text = "Processing " & File.Name(sPackagePath)
+  SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF | 
grep " & File.Name(sPackagePath) & " | cut -f 2 -d :" TO vSize
+  IF vSize <> "" THEN
+    SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " ) && echo 
$gsize | cut -f3 -d \' \'" TO vTargetSize
+  END IF
+  FrmInstallSys.pbInstallProg.Value = 0
+  INC iPkgNum
+  PRINT "Package " & iPkgNum & " of " & iPkgCnt
+  MdlSetup.SHOW_PROGRESS_CONTROLS()
+  FrmInstallSys.tlCurrPkg.Text = "Processing " & File.Name(sPackagePath)
    hproc = SHELL "install-pkg " & sPackagePath & Space(1) & 
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
-      WAIT 1
-        IF hproc.State = Process.Running THEN
-          REPEAT
-            WAIT 1
-
-              ' do the progress bar updating here
-                IF vSize <> "" THEN
-                  
MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vSize))
-                  FrmInstallSys.pbInstallProg2.Value = 
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
-                END IF
-
-          UNTIL
-            hproc.state = Process.Stopped
-                ' now do the error checking here and return a value
-
-                  IF InStr(sDump, "FAILED") > 0 THEN
-                    'ERROR HAS OCCURRED
-                    RETURN 1
-                  ELSE
-                    RETURN 0
-                  END IF
-        END IF
+  WAIT 1
+  IF hproc.State = Process.Running THEN
+    REPEAT
+    WAIT 1
+    ' do the progress bar updating here
+    IF vSize <> "" THEN
+      MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vSize))
+    END IF
+    UNTIL
+      hproc.state = Process.Stopped
+      ' now do the error checking here and return a value
+      IF InStr(sDump, "FAILED") > 0 THEN
+        'ERROR HAS OCCURRED
+        RETURN 1
+      ELSE
+        FrmInstallSys.pbInstallProg.Value = 1
+        WAIT
+        FrmInstallSys.pbInstallProg2.Value = 
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+        RETURN 0
+      END IF
+  END IF
 END


@@ -470,8 +426,6 @@
   READ #LAST, sLine, -256
   sDump = sDump & gb.NewLine & sLine
   PRINT sLine
-
-
 END

 PUBLIC SUB process_error(msg AS String)

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Thu Jul 31 18:25:06 2008
@@ -276,11 +276,15 @@
     END IF

     ' WRITE THE FSTAB NOW
-    MdlInstallSys.WRITE_NEW_FSTAB()
-    FrmInstallSys.pbInstallProg.Value = 1
-        FrmInstallSys.pbInstallProg2.Value = 1
+  MdlInstallSys.WRITE_NEW_FSTAB()
+  FrmInstallSys.pbInstallProg.Value = 1
+  FrmInstallSys.pbInstallProg2.Value = 1
    Message.Info("Vectorlinux is now installed in your system. Please 
Exit the installer")
-  MdlCore.unlock_gui()
+  WITH FMain
+    .btQuit.Enabled = TRUE
+    .btQuit.ForeColor = Color.Black
+  END WITH
+  'MdlCore.unlock_gui()
 END



Modified: branches/iVL/install-pkg
==============================================================================
--- branches/iVL/install-pkg	(original)
+++ branches/iVL/install-pkg	Thu Jul 31 18:25:06 2008
@@ -83,8 +83,7 @@

 case $packagetype in
     tlz)
-      lzmadec <$package | /bin/tar-1.13-pkgtools -C $ROOT -xlUpv >$TMP/$shortnam
-e 2>/dev/null
+      lzmadec <$package | /bin/tar-1.13-pkgtools -C $ROOT -xlUpv 
>$TMP/$shortname 2>/dev/null
         ;;
     tbz|tbz2)
       tar $EXCLUDED -C $ROOT -xjlUpv <$package >$TMP/$shortname 2>/dev/null
@@ -113,11 +112,9 @@
 fi

 if [ -r $ROOT/install/slack-desc ]; then
-    cat $ROOT/install/slack-desc | grep "^$packagebase:" >> $ADM_DIR/packages/$s
-hortname 2> /dev/null
+    cat $ROOT/install/slack-desc | grep "^$packagebase:" >> 
$ADM_DIR/packages/$shortname 2> /dev/null
     if [ "$shortname" != "$packagebase" ]; then
-      cat $ROOT/install/slack-desc | grep "^$shortname:" >> $ADM_DIR/packages/$s
-hortname 2> /dev/null
+      cat $ROOT/install/slack-desc | grep "^$shortname:" >> 
$ADM_DIR/packages/$shortname 2> /dev/null
     fi
 fi

@@ -129,8 +126,7 @@
      # Some dumb bunny built a package with something other than 
makepkg.  Bad!
     # Oh well.  Bound to happen.  Par for the course.  Fix it and move on...
     echo './' >> $ADM_DIR/packages/$shortname
-    cat $TMP/$shortname | grep -v '^./$' | cut -b3- >> $ADM_DIR/packages/$shortn
-ame
+    cat $TMP/$shortname | grep -v '^./$' | cut -b3- >> $ADM_DIR/packages/$shortname
 fi

 if [ -f $ROOT/install/doinst.sh ]; then

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