Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r91 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-07-31 18:31:41
|
Author: uelsk8s
Date: Thu Jul 31 11:30:52 2008
New Revision: 91
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/MdlInstallSys.module
branches/iVL/MdlSetup.module
branches/iVL/installer.gambas
Log:
fixing full-install progress
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/.project
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsGlobal.class
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsPartSel.class
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsWinDrives.class
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FMain.class
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmDiskPart.class
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmLicense.class
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartScheme.class
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartSel.class
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPkgSel.class
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSelISO.class
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSummary.class
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmWinDrives.class
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlCore.module
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlDiskPart.module
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlObjSizer.module
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPkgSel.module
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSummarize.module
+# /home/uel/svn-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 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlWinDrives.module
+# /home/uel/svn-installer/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 11:30:52 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.28
+Version=0.0.29
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -16,6 +16,7 @@
Language=en_US
ControlPublic=1
ModulePublic=1
+ExecPath=/home/uel/svn-installer/installer.gambas
Maintainer=benoit
Vendor=Princeton
Address=benoit@localhost
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Jul 31 11:30:52 2008
@@ -18,9 +18,8 @@
PRIVATE hproc AS Process
PRIVATE sDump AS String
PRIVATE sErr AS String
-
-PRIVATE iPkgCnt AS Integer
-PRIVATE iPkgNum AS Integer = 0
+ PRIVATE iPkgCnt AS Integer
+ PRIVATE iPkgNum AS Integer = 0
@@ -31,9 +30,7 @@
ClsGlobal.sTargetMnt = "/mnt/target"
IF Exist(ClsGlobal.sTargetMnt) = FALSE THEN
TRY MKDIR ClsGlobal.sTargetMnt
- END IF
-
-
+ END IF
SHELL "umount " & ClsGlobal.sTargetMnt WAIT 'clear the mount point
'/DISABLED FOR TESTING INSTALL ONLY
@@ -75,15 +72,10 @@
MdlInstallCustom.PERFORM_CUSTOM_INSTALL
ELSE
MdlInstallSys.PERFORM_FULL_INSTALL()
- END IF
-
-
-
-
+ END IF
END
-
PUBLIC FUNCTION WRITE_NEW_FSTAB() AS Integer
DIM sEntry AS String
@@ -95,11 +87,7 @@
DIM sWinMntPnt AS String
DIM sFstab AS String
- ' make the changes show up on the steps now
-
-
-
-
+ ' make the changes show up on the steps now
FrmInstallSys.tlCurrPkg.Text = "Writing new /etc/fstab to system"
sFstab = "# /etc/fstab: static file system information.\n" &
@@ -213,9 +201,10 @@
'ME.INSTALL_REQUIRED_PACKAGES()
'ME.INSTALL_PACKAGES()
- ' END IF
-
+ ' END IF
END
+
+
PUBLIC FUNCTION fS_oPTIONS(sType AS String) AS String
DIM sMntOpts AS String
@@ -233,28 +222,23 @@
sMntOpts = "defaults"
END SELECT
- RETURN sMntOpts
-
-
+ RETURN sMntOpts
END
+
PUBLIC SUB PERFORM_FULL_INSTALL()
-
-
- DIM iret AS Integer
-
+
+ DIM iret AS Integer
ClsGlobal.sTargetMnt = "/mnt/target"
- iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
- Message.Info("Total packages = " & iPkgCnt)
+
WITH FMain
.tvPlan["Inst2"].Selected = TRUE
.tvPlan["Inst2"].Picture = MdlCore.sNowPic
.tvPlan["Inst1"].Picture = MdlCore.sDonePic
- END WITH
-
-
-
+ END WITH
+ iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
+ Message.Info("Total packages = " & iPkgCnt)
PRINT "Installing bulks"
MdlSetup.SHOW_PROGRESS_CONTROLS()
iret = ME.INSTALL_BULK_PACKAGES()
@@ -293,17 +277,13 @@
' WRITE THE FSTAB NOW
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()
END
-
-
-
PUBLIC FUNCTION INSTALL_PACKAGES_NEW() AS Integer
DIM sFile AS String = File.Load(ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT")
@@ -313,35 +293,37 @@
DIM vPgsSize AS Variant
DIM sPkgPath AS String
DIM sPkgName AS String
- DIM vTargetSize AS Variant
-
+ DIM vTargetSize AS Variant
arrFile = Split(sFile, "\n")
FOR i = 0 TO arrFile.Count - 1
+ FrmInstallSys.pbInstallProg.Value = 0
sLine = Trim(arrFile[i])
- 'WAIT 10
IF Left(sLine, Len("PACKAGE_NAME")) = "PACKAGE NAME" THEN
sPkgName = Trim(Right(sLine, Len(sLine) - InStr(sLine, ":")))
- 'sPkgPath = Right(arrFile[
sPkgPath = Right(Right(arrFile[i + 1], Len(arrFile[i +
1]) - InStr(arrFile[i + 1], ":")), -4)
vPgsSize = Left(Right(arrFile[i + 3], Len(arrFile[i +
3]) - InStr(arrFile[i + 3], ":")), -2)
+ FrmInstallSys.tlCurrPkg.Text = "Installing " &
sPkgName & " ..."
' now install the package
SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot
& " ) && echo $gsize | cut -f3 -d \' \'" TO vTargetSize
PRINT "installing " & ClsGlobal.sSourceMnt
&/ "packages" &/ sPkgPath &/ sPkgName
+ INC iPkgNum
ME.PACKAGE_INSTALL(ClsGlobal.sSourceMnt
&/ "packages" &/ sPkgPath &/ sPkgName)
WAIT
IF hproc.State = Process.Running THEN
REPEAT
- WAIT 3
- ' update progree here
+ WAIT 1
+ ' update progress here
ME.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vPgsSize))
UNTIL
hproc.State = Process.Stopped
END IF
-
END IF
+ FrmInstallSys.pbInstallProg.Value = 1
+ WAIT
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
NEXT
- ' error check
+ 'error check
IF InStr(sDump, "FAILED") > 0 THEN
PRINT sPkgName & " failed to install "
RETURN 1
@@ -351,10 +333,6 @@
END
-
-
-
-
PUBLIC FUNCTION INSTALL_BULK_PACKAGES() AS Integer
DIM sRawList AS String
DIM sList AS String[]
@@ -368,17 +346,14 @@
DIM i AS Integer
'DIM sFile AS String = File.Load(ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF")
DIM sLine AS String
- PRINT "inside INSTALL_BULK_PACKAGES"
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^BULK" TO sRawList
- ' sList = Split(File.Load(Temp$("SETUP.CONF")), "\n")
-
+ ' sList = Split(File.Load(Temp$("SETUP.CONF")), "\n")
sList = Split(sRawList, "\n")
- PRINT sRawList & "srawlist " & sList.Count
+ 'PRINT sRawList & "srawlist " & sList.Count
FOR i = 0 TO sList.count - 1
- 'SHELL ". /mnt/cdrom/veclinux/SETUP.CONF && echo $BULK"
& i TO sList[i]
'sLine = Trim(sList[i])
- PRINT sList[i]
+ 'PRINT sList[i]
IF Left(sList[i], Len("BULK")) = "BULK" THEN
sTrimmed = Right(sList[i], Len(sList[i]) - InStr(sList[i], "\'"))
@@ -387,11 +362,13 @@
sBulkPath = sLineArr[0]
vBulkSize = sLineArr[1]
sBulkDesc = sLineArr[2]
- PRINT sBulkPath & vBulkSize & sBulkDesc
-
+ 'PRINT sBulkPath & vBulkSize & sBulkDesc
+ FrmInstallSys.pbInstallProg.Value = 0
+ INC iPkgNum
SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " )
&& echo $gsize | cut -f3 -d \' \'" TO vTargetSize
- PRINT "installing " & sBulkPath
- ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulkPath)
+ PRINT "installing " & sBulkPath
+ FrmInstallSys.tlCurrPkg.Text = "Installing " &
sBulkDesc & " ..."
+ 'ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulkPath)
hproc = SHELL "lzmadec <" & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sBulkPath & " | tar -xp -C " & ClsGlobal.sTargetMnt
& " || echo \'FAILED\'" FOR READ
PRINT sBulkPath
WAIT 1
@@ -401,9 +378,12 @@
ME.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vBulkSize))
UNTIL
hproc.State = Process.Stopped
- 'error check
- END IF
- END IF
+ 'error check
+ END IF
+ END IF
+ FrmInstallSys.pbInstallProg.Value = 1
+ WAIT
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
NEXT
'RETURN
IF InStr(sDump, "FAILED") > 0 THEN
@@ -419,24 +399,18 @@
sDump = ""
sErr = ""
- hproc = SHELL "lzmadec <" & sPath_to_bulk & " | tar -xp -C " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
-
-
-
+ hproc = SHELL "lzmadec <" & sPath_to_bulk & " | tar -xp -C " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
END
+
PUBLIC SUB PACKAGE_INSTALL(sPath_To_Package AS String)
sDump = ""
sErr = ""
- hproc = SHELL "install-pkg " & sPath_To_Package & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
-
-
+ hproc = SHELL "install-pkg " & sPath_To_Package & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
END
-
-
PUBLIC SUB PERFORM_FULL_INSTALL_OLD() AS Integer
'Will need to read SETUP.CONF to determine what to do here
@@ -458,8 +432,7 @@
DIM sBulkPath AS String
DIM sConfPath AS String
DIM sOptPkgPath AS String
- DIM iVal AS Float
-
+ DIM iVal AS Float
DIM sBasePath AS String = ClsGlobal.sSourceMnt &/ "veclinux"
WITH FrmInstallSys
@@ -473,8 +446,7 @@
.tvPlan["Inst1"].Picture = MdlCore.sDonePic
.tvPlan["Inst2"].Selected = TRUE
.tvPlan["Inst2"].Picture = MdlCore.sNowPic
- END WITH
-
+ END WITH
MdlSetup.SHOW_PROGRESS_CONTROLS()
FrmInstallSys.tlBanner.Text = "Vectorlinux is now being installed.
Please wait..."
@@ -482,7 +454,6 @@
sFile = Split(File.Load(Temp$("SETUP.CONF")), "\n")
FOR i = 0 TO sFile.count - 1
sLine = Trim(sFile[i])
-
IF Left(sLine, Len("BULK") + 1) LIKE "BULK" & "*[0-9]*" THEN
sLine = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
sLine = Left(sLine, Len(sLine) - 1)
@@ -497,14 +468,13 @@
SHELL "export gsize=$(df| grep " &
ClsPartSel.sRoot & " ) && echo $gsize | cut -f3 -d \' \'" TO sTargetSize
'Message(CStr(sTargetSize))
sTargetSize = Trim(CStr(sTargetSize))
- sPakSize = Trim(CStr(sPakSize))
-'
+ sPakSize = Trim(CStr(sPakSize)) '
'RETURN
FrmInstallSys.tlCurrPkg.Text = "Installing " &
sPakDesc & " ..."
FrmInstallSys.pbInstallProg.Value = 0.0
- PRINT "Installing " &
sPakDesc & " Total size (KB) = " & CStr(sPakSize)
+ PRINT "Installing " & sPakDesc & " Total size (KB) = "
& CStr(sPakSize)
sDump = ""
sErr = ""
MdlCore.LOCK_GUI()
@@ -515,9 +485,7 @@
IF hproc.State = Process.Running THEN
REPEAT
WAIT 2
- UPDATE_STEP_PROGRESS(sTargetSize, sPakSize)
-
-
+ UPDATE_STEP_PROGRESS(sTargetSize, sPakSize)
UNTIL
hproc.State = Process.Stopped
' error check
@@ -527,8 +495,7 @@
sErr)
RETURN 1
ELSE
- FrmInstallSys.pbInstallProg.Value = 1
-
+ FrmInstallSys.pbInstallProg.Value = 1
END IF
PRINT sPak & " is installed... "
INC iPkgNum
@@ -541,11 +508,10 @@
' now to the packages individually
' FrmInstallSys.tlBanner.Text = "Installing additional software."
- ' ME.INSTALL_PACKAGES
-
-
+ ' ME.INSTALL_PACKAGES
END
+
PUBLIC SUB UPDATE_STEP_PROGRESS(sTargetSize AS Float, sPakSize AS Float)
DIM iMBProgress AS Float
@@ -575,12 +541,10 @@
IF iVal > FrmInstallSys.pbInstallProg.Value THEN
FrmInstallSys.pbInstallProg.Value = iVal
END IF
- 'PRINT CStr(iCurrSize) & "/" & CStr(sTargetSize +
sPakSize) & " = " & iVal & "%"
+ PRINT CStr(iCurrSize) & "/" & CStr(sTargetSize + sPakSize) & " = " &
iVal & "%"
END
-
-
PUBLIC FUNCTION INSTALL_PACKAGES() AS Integer
DIM i AS Integer
@@ -635,8 +599,8 @@
END IF
END IF
END IF
- INC iPkgNum
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ INC iPkgNum
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
END IF
NEXT
@@ -644,12 +608,11 @@
'Message.Info("Installation complete. Ready for configuration"
FrmInstallSys.tlBanner.Text = "Installation phase complete.
Ready for configuration"
FrmInstallSys.pbInstallProg.Value = 1
- MdlCore.unlock_gui()
-
- FrmInstallSys.tlBanner.Text = "Installing default system
configuration and required software."
- ME.INSTALL_REQUIRED_PACKAGES
-
+ MdlCore.unlock_gui()
+ FrmInstallSys.tlBanner.Text = "Installing default system
configuration and required software."
END
+
+
PUBLIC FUNCTION INSTALL_REQUIRED_PACKAGES() AS Integer
DIM i AS Integer
@@ -666,15 +629,11 @@
'sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT"))
SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sRawFile
sFile = Split(sRawFile, "\n")
- 'SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sFile
- iTlzTotal = sFile.Count
-
+ iTlzTotal = sFile.Count
FOR i = 0 TO sFile.count - 1
sLine = Trim(sFile[i])
INC iPkgNum
-
- sTlzPath = Trim(sLine)
-
+ sTlzPath = Trim(sLine)
' now install the package with the information we already have
PRINT sTlzName & sTlzPath
'sDump = ""
@@ -700,7 +659,9 @@
hproc.State = Process.Stopped
' INC iPkgNum
END IF
- NEXT
+ NEXT
+ FrmInstallSys.pbInstallProg.Value = 1
+ WAIT 1
IF InStr(sDump, "FAILED") > 0 THEN
PRINT "Error installing packages/required"
@@ -719,8 +680,7 @@
DIM sCOnfLine AS String
DIM sPkgPath AS String
DIM i AS Integer
-
-
+
PRINT "Installing final system configuration"
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF"
& " | grep ^CONF" TO sRawList
'Message.Info(sRawList)
@@ -760,6 +720,7 @@
sLinarr = Split(sRawList, ":")
sPkgPath = Right(sLinarr[0], Len(sLinarr[0]) - InStr(sLinarr[0], "\'"))
' now install the package
+ FrmInstallSys.tlCurrPkg.Text = "Installing Final
configuration files..."
INC iPkgNum
'hproc = SHELL "install-pkg " & sPkgPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sPkgPath)
@@ -770,27 +731,22 @@
WAIT 2
UNTIL
hproc.State = Process.Stopped
-' INC iPkgNum
END IF
' END IF
IF InStr(sDump, "FAILED") > 0 THEN
RETURN 1
ELSE
RETURN 0
- END IF
-
+ END IF
END
-
PUBLIC SUB Process_read()
DIM sLine AS String
READ #LAST, sLine, -256
sDump = sDump & gb.NewLine & sLine
- PRINT sLine
-
-
+ PRINT sLine
END
PUBLIC SUB process_error(msg AS String)
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Thu Jul 31 11:30:52 2008
@@ -147,9 +147,9 @@
PUBLIC FUNCTION UPDATE_OVERALL_PROGRESS(iTotalPkgs AS Integer,
iCurrPkg AS Integer) AS Float
DIM fRet AS Float
- ' IF iTotalPkgs = 0 THEN
- ' iTotalPkgs = 10
- ' ENDIF
+ IF iTotalPkgs = 0 THEN
+ iTotalPkgs = 30
+ ENDIF
fRet = iCurrPkg / iTotalPkgs
fRet = Round(fRet, -2)
@@ -191,7 +191,7 @@
' END IF
' NEXT
' iQTY = sList.Count
- SHELL "find /mnt/cdrom -name *.tlz|wc -l" TO iQTY
+ SHELL "find " & ClsGlobal.sSourceMnt & " -name *.tlz|wc -l" TO iQTY
ELSE ' GOING FOR CUSTOM INSTALL
END IF
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
