Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r92 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-07-31 21:31:03
|
Author: M0...@gm...
Date: Thu Jul 31 14:29:44 2008
New Revision: 92
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/MdlInstallCustom.module
branches/iVL/MdlPartSel.module
Log:
- Wrote function to install bulks using lzmadec rather than install-pkg.
- Modified custom install procedure to use the new function.
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/.project
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/ClsGlobal.class
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/ClsPartSel.class
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/ClsWinDrives.class
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FMain.class
+# /home/moises/area-51/projects/installer/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 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmDiskPart.class
+# /home/moises/area-51/projects/installer/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 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmLicense.class
+# /home/moises/area-51/projects/installer/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 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmPartScheme.class
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmPartSel.class
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmPkgSel.class
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmSelISO.class
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmSummary.class
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmWinDrives.class
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlCore.module
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlDiskPart.module
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlObjSizer.module
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlPartSel.module
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlPkgSel.module
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlSetup.module
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlSummarize.module
+# /home/moises/area-51/projects/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 Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlWinDrives.module
+# /home/moises/area-51/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Thu Jul 31 14:29:44 2008
@@ -244,7 +244,8 @@
sPkg = ClsPkgSel.arrBulks[i]
'install the packages now
PRINT " + Install " & sPkgPath &/ sPkg
- iRet = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
+ 'iRet = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
+ iret = ME.INSTALL_THIS_BULK(sPkgPath &/ sPkg)
IF iRet <> 0 THEN
RETURN 1
END IF
@@ -343,7 +344,8 @@
' do the sizing
PRINT " + install " & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sBulk
- iRet =
ME.INSTALL_THIS_PACKAGE(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
@@ -374,6 +376,49 @@
+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 = ""
+ IF vSize <> "" THEN
+ SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " ) &&
echo $gsize | cut -f3 -d \' \'" TO vTargetSize
+ END IF
+
+ INC iPkgNum
+ PRINT " Installing " & sBulkPath
+ MdlSetup.SHOW_PROGRESS_CONTROLS()
+ FrmInstallSys.tlCurrPkg.Text = "Installing " & File.Name(sBulkPath)
+ hproc = SHELL "install-pkg " & sBulkPath & Space(1) &
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
+
+
+
+
+END
+
+
PUBLIC FUNCTION INSTALL_THIS_PACKAGE(sPackagePath AS String) AS Integer
DIM vSize AS Variant
DIM vTargetSize AS Variant
@@ -399,7 +444,7 @@
' do the progress bar updating here
IF vSize <> "" THEN
-
MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vTargetSize))
+
MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vSize))
FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
END IF
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Thu Jul 31 14:29:44 2008
@@ -318,115 +318,7 @@
END SELECT
-
-
- ' FOR EACH sdropdwn IN oMountPoints
- ' IF LAST.text <> "Not Used" AND LAST.text = sdropdwn.Text AND
LAST.tag <> sdropdwn.tag THEN
- ' Message.Error("You have already select a " & LAST.text & "
partition. Please " &
- ' "select only one")
- ' LAST.text = "Not Used"
- ' STOP EVENT
- ' ELSE
- '
- '
- '
- ' ' set the variable to the global class
- ' SELECT CASE Trim(LCase(LAST.text))
- ' CASE "/"
- ' ClsPartSel.sRoot = LCase(LAST.tag)
- ' CASE "/home"
- ' ClsPartSel.sHome = LCase(LAST.tag)
- ' CASE "/usr"
- ' ClsPartSel.sUsr = LCase(LAST.tag)
- ' CASE "/opt"
- ' ClsPartSel.sOpt = LCase(LAST.tag)
- ' CASE "/tmp"
- ' ClsPartSel.sTmp = LCase(LAST.tag)
- ' CASE "/var"
- ' ClsPartSel.sVar = LCase(LAST.tag)
- ' CASE "Swap"
- ' ClsPartSel.sSwap = LCase(LAST.tag)
- ' FOR EACH sdropdwn IN oFsTypes
- ' IF Trim(sdropdwn.Tag) = LAST.tag THEN
- ' sdropdwn.Enabled = FALSE
- ' sdropdwn.Text = "Swap"
- ' END IF
- ' NEXT
- '
- ' END SELECT
- ' END IF
- ' NEXT
-
- 'Message(sTag)
- '
- ' SELECT CASE sText
- ' CASE "Not Used"
- ' FOR EACH sdropdwn IN oFsTypes
- ' IF sdropdwn.Tag = sTag THEN
- ' sdropdwn.Enabled = FALSE
- ' sdropdwn.Text = "Do not format"
- ' END IF
- ' NEXT
- ' CASE "Swap"
- ' FOR EACH sdropdwn IN oFsTypes
- ' IF sdropdwn.Tag = sTag THEN
- ' sdropdwn.Enabled = FALSE
- ' sdropdwn.Text = "Swap"
- ' END IF
- ' NEXT
- ' CASE ELSE
- ' FOR EACH sdropdwn IN oFsTypes
- ' IF sdropdwn.Tag = sTag THEN
- ' sdropdwn.Enabled = TRUE
- ' END IF
- ' NEXT
- ' END SELECT
- '
- ' IF sText = "Not Used" THEN
- ' FOR EACH sdropdwn IN oFsTypes
- ' IF sdropdwn.Tag LIKE sTag THEN
- ' sdropdwn.Enabled = FALSE
- ' sdropdwn.Text = "Do not format"
- '
- '
- ' ELSE IF sText = "Swap" THEN
- ' IF sdropdwn.Tag = sTag THEN
- ' sdropdwn.Enabled = FALSE
- ' sdropdwn.Text = "Swap"
- ' END IF
- ' ELSE
- ' sdropdwn.Enabled = TRUE
- ' END IF
- ' NEXT
- ' 'ELSE
- '
- ' ELSE
- ' FOR EACH sdropdwn IN oFsTypes
- ' IF sdropdwn.Tag = sTag THEN
- ' sdropdwn.Enabled = TRUE
- ' END IF
- ' NEXT
- ' END IF
- ' IF LAST.text <> "Not Used" AND LAST.text <> "Swap" THEN
- ' FOR EACH sdropdwn IN oFsTypes
- ' IF sdropdwn.tag = LAST.tag THEN
- ' sdropdwn.Text = "XFS"
- ' 'Balloon.Info("Select which filesystem to use with this
partition", sdropdwn)
- ' ' Balloon("Select which filesystem to use with this partition", sdropdwn)
-
-' END IF
- ' NEXT
- ' ELSE IF LAST.text = "Swap" THEN
- ' FOR EACH sdropdwn IN oFsTypes
- ' IF sdropdwn.tag = LAST.tag THEN
- ' sdropdwn.Enabled = FALSE
- ' sdropdwn.Text = "Swap"
- ' END IF
- ' NEXT
- ' END IF
-
- 'send the value to the form public value
ME.SET_SELECTED_PARTITION(LAST.tag, LAST.text)
|
