Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r548 - - Added code to perform full installation
|
From: <cod...@go...> - 2009-05-13 21:23:56
|
Author: M0...@gm...
Date: Wed May 13 14:15:01 2009
New Revision: 548
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/MdlBootMngr.pot
branches/speedy/.lang/MdlMain.pot
branches/speedy/.lang/Step7.pot
branches/speedy/ClsGlobal.class
branches/speedy/MdlBootMngr.module
branches/speedy/MdlMain.module
branches/speedy/Step7.class
branches/speedy/Step9.form
Log:
- Added code to perform full installation
- Added code to perform minimal installation
- Removed wait lag for speed performance improvements.
- Switched to EXEC in installation process for better install time.
- Changed FULL install procedure to use the bulk installation function
- Changed the CUSTOM install procedure to use the bulk installation function
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed May 13 14:15:01 2009
@@ -244,7 +244,7 @@
msgid "When finished, Click"
msgstr ""
-#: Conf3.class:47 MdlMain.module:496 Step3a1a.class:177 Step3a2.class:359
+#: Conf3.class:47 MdlMain.module:502 Step3a1a.class:177 Step3a2.class:359
#: Step3a3a.class:72 Step5.class:177
msgid "to continue"
msgstr ""
@@ -624,96 +624,97 @@
msgid "Bootsector of"
msgstr ""
-#: MdlBootMngr.module:401
+#: MdlBootMngr.module:404
msgid "You must select one operating system to be started by default"
msgstr ""
-#: MdlBootMngr.module:419
+#: MdlBootMngr.module:422
msgid ""
"Found duplicate operating system names. Please use unique labels for
each "
"menu entry"
msgstr ""
-#: MdlBootMngr.module:422
+#: MdlBootMngr.module:425
msgid "Check these boxes to make sure they have unique names"
msgstr ""
-#: MdlMain.module:35
+#: MdlMain.module:37
msgid "Unable to format"
msgstr ""
-#: MdlMain.module:35
+#: MdlMain.module:37
msgid "to"
msgstr ""
-#: MdlMain.module:193
+#: MdlMain.module:195
msgid "Failed to create user account. See error below."
msgstr ""
-#: MdlMain.module:254
+#: MdlMain.module:256
msgid "Formatting"
msgstr ""
-#: MdlMain.module:254
+#: MdlMain.module:256
msgid "with"
msgstr ""
-#: MdlMain.module:331
+#: MdlMain.module:333
msgid "Installing required package"
msgstr ""
-#: MdlMain.module:334
+#: MdlMain.module:336
msgid "Problem while installing"
msgstr ""
-#: MdlMain.module:346
-msgid "Extracting basic system structure."
-msgstr ""
-
-#: MdlMain.module:394
+#: MdlMain.module:382
msgid "Preparing system partitions"
msgstr ""
-#: MdlMain.module:396
+#: MdlMain.module:384
msgid "An error occurred while preparing partitions. Unable to continue"
msgstr ""
-#: MdlMain.module:404
+#: MdlMain.module:392
msgid "Error during installation of required software. Unable to continue"
msgstr ""
-#: MdlMain.module:496
+#: MdlMain.module:440
+msgid "Unable to install contents of"
+msgstr ""
+
+#: MdlMain.module:440
+msgid "Cannot continue"
+msgstr ""
+
+#: MdlMain.module:502
msgid "Installation is complete. Click"
msgstr ""
-#: MdlMain.module:498
+#: MdlMain.module:504
msgid "Installation complete... Click"
msgstr ""
-#: MdlMain.module:498
+#: MdlMain.module:504
msgid "to continue."
msgstr ""
-#: MdlMain.module:509
-msgid ""
-"Unable to install the software in the development group. Cannot continue."
+#: MdlMain.module:524
+msgid "Unable to install the components of"
msgstr ""
-#: MdlMain.module:515
-msgid ""
-"Unable to install the software in the Graphical Interface group. Cannot "
-"continue"
+#: MdlMain.module:524
+msgid "Unable to continue."
msgstr ""
-#: MdlMain.module:535
+#: MdlMain.module:591
msgid "Installing"
msgstr ""
-#: MdlMain.module:535
+#: MdlMain.module:591
msgid "Part of"
msgstr ""
-#: MdlMain.module:537
+#: MdlMain.module:593
msgid "Error installing"
msgstr ""
@@ -1461,35 +1462,35 @@
msgid "Select Installation Mode"
msgstr ""
-#: Step7.class:156
+#: Step7.class:146
msgid "Full Install"
msgstr ""
-#: Step7.class:166
+#: Step7.class:156
msgid "Install everthing in the image (Fully Automated)"
msgstr ""
-#: Step7.class:174 Step8.class:137
+#: Step7.class:164 Step8.class:137
msgid "Customized"
msgstr ""
-#: Step7.class:184
+#: Step7.class:174
msgid "Select the components you wish to install (Advanced)"
msgstr ""
-#: Step7.class:192 Step8.class:139
+#: Step7.class:182 Step8.class:139
msgid "Minimal"
msgstr ""
-#: Step7.class:202
+#: Step7.class:192
msgid "Install the most minimal working confuguration (For older hardware)"
msgstr ""
-#: Step7.class:215
+#: Step7.class:205
msgid "Include Development Tools"
msgstr ""
-#: Step7.class:228
+#: Step7.class:218
msgid "Include Light-weight graphical environment"
msgstr ""
@@ -1627,6 +1628,6 @@
msgid "Install Process"
msgstr ""
-#: Step9.class:239
+#: Step9.class:240
msgid "The development Crew"
msgstr ""
Modified: branches/speedy/.lang/MdlBootMngr.pot
==============================================================================
--- branches/speedy/.lang/MdlBootMngr.pot (original)
+++ branches/speedy/.lang/MdlBootMngr.pot Wed May 13 14:15:01 2009
@@ -54,15 +54,15 @@
msgid "Bootsector of"
msgstr ""
-#: MdlBootMngr.module:401
+#: MdlBootMngr.module:404
msgid "You must select one operating system to be started by default"
msgstr ""
-#: MdlBootMngr.module:419
+#: MdlBootMngr.module:422
msgid "Found duplicate operating system names. Please use unique labels
for each menu entry"
msgstr ""
-#: MdlBootMngr.module:422
+#: MdlBootMngr.module:425
msgid "Check these boxes to make sure they have unique names"
msgstr ""
Modified: branches/speedy/.lang/MdlMain.pot
==============================================================================
--- branches/speedy/.lang/MdlMain.pot (original)
+++ branches/speedy/.lang/MdlMain.pot Wed May 13 14:15:01 2009
@@ -14,83 +14,87 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlMain.module:35
+#: MdlMain.module:37
msgid "Unable to format"
msgstr ""
-#: MdlMain.module:35
+#: MdlMain.module:37
msgid "to"
msgstr ""
-#: MdlMain.module:193
+#: MdlMain.module:195
msgid "Failed to create user account. See error below."
msgstr ""
-#: MdlMain.module:254
+#: MdlMain.module:256
msgid "Formatting"
msgstr ""
-#: MdlMain.module:254
+#: MdlMain.module:256
msgid "with"
msgstr ""
-#: MdlMain.module:331
+#: MdlMain.module:333
msgid "Installing required package"
msgstr ""
-#: MdlMain.module:334
+#: MdlMain.module:336
msgid "Problem while installing"
msgstr ""
-#: MdlMain.module:346
-msgid "Extracting basic system structure."
-msgstr ""
-
-#: MdlMain.module:394
+#: MdlMain.module:382
msgid "Preparing system partitions"
msgstr ""
-#: MdlMain.module:396
+#: MdlMain.module:384
msgid "An error occurred while preparing partitions. Unable to continue"
msgstr ""
-#: MdlMain.module:404
+#: MdlMain.module:392
msgid "Error during installation of required software. Unable to continue"
msgstr ""
-#: MdlMain.module:496
+#: MdlMain.module:440
+msgid "Unable to install contents of"
+msgstr ""
+
+#: MdlMain.module:440
+msgid "Cannot continue"
+msgstr ""
+
+#: MdlMain.module:502
msgid "Installation is complete. Click"
msgstr ""
-#: MdlMain.module:496
+#: MdlMain.module:502
msgid "to continue"
msgstr ""
-#: MdlMain.module:498
+#: MdlMain.module:504
msgid "Installation complete... Click"
msgstr ""
-#: MdlMain.module:498
+#: MdlMain.module:504
msgid "to continue."
msgstr ""
-#: MdlMain.module:509
-msgid "Unable to install the software in the development group. Cannot
continue."
+#: MdlMain.module:524
+msgid "Unable to install the components of"
msgstr ""
-#: MdlMain.module:515
-msgid "Unable to install the software in the Graphical Interface group.
Cannot continue"
+#: MdlMain.module:524
+msgid "Unable to continue."
msgstr ""
-#: MdlMain.module:535
+#: MdlMain.module:591
msgid "Installing"
msgstr ""
-#: MdlMain.module:535
+#: MdlMain.module:591
msgid "Part of"
msgstr ""
-#: MdlMain.module:537
+#: MdlMain.module:593
msgid "Error installing"
msgstr ""
Modified: branches/speedy/.lang/Step7.pot
==============================================================================
--- branches/speedy/.lang/Step7.pot (original)
+++ branches/speedy/.lang/Step7.pot Wed May 13 14:15:01 2009
@@ -18,35 +18,35 @@
msgid "Select Installation Mode"
msgstr ""
-#: Step7.class:156
+#: Step7.class:146
msgid "Full Install"
msgstr ""
-#: Step7.class:166
+#: Step7.class:156
msgid "Install everthing in the image (Fully Automated)"
msgstr ""
-#: Step7.class:174
+#: Step7.class:164
msgid "Customized"
msgstr ""
-#: Step7.class:184
+#: Step7.class:174
msgid "Select the components you wish to install (Advanced)"
msgstr ""
-#: Step7.class:192
+#: Step7.class:182
msgid "Minimal"
msgstr ""
-#: Step7.class:202
+#: Step7.class:192
msgid "Install the most minimal working confuguration (For older hardware)"
msgstr ""
-#: Step7.class:215
+#: Step7.class:205
msgid "Include Development Tools"
msgstr ""
-#: Step7.class:228
+#: Step7.class:218
msgid "Include Light-weight graphical environment"
msgstr ""
Modified: branches/speedy/ClsGlobal.class
==============================================================================
--- branches/speedy/ClsGlobal.class (original)
+++ branches/speedy/ClsGlobal.class Wed May 13 14:15:01 2009
@@ -74,6 +74,5 @@
STATIC PUBLIC sDefBoot AS String
STATIC PUBLIC sInstallType AS String ' type of installation to be done
(Full, Custom, Minimal)
-STATIC PUBLIC bInstallX11 AS Boolean
-STATIC PUBLIC bInstallDev AS Boolean
+STATIC PUBLIC objMinComponents AS NEW Object[]
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Wed May 13 14:15:01 2009
@@ -370,8 +370,11 @@
SHELL "cat " & $file & " | grep ^" & sOsRoot TO sDump
sDump = Trim(sDump)
$dumparr = Split(sDump, gb.NewLine)
- IF NOT ($dumparr) THEN RETURN
+ 'IF NOT ($dumparr) THEN RETURN
+ IF $dumparr.Count <= 0 THEN RETURN
+
' always grab the first line only for each os
+ 'IF NOT Trim($dumparr[0]) THEN RETURN
$line = Trim($dumparr[0])
IF NOT ($line) THEN RETURN
Modified: branches/speedy/MdlMain.module
==============================================================================
--- branches/speedy/MdlMain.module (original)
+++ branches/speedy/MdlMain.module Wed May 13 14:15:01 2009
@@ -14,6 +14,8 @@
' You should have received a copy of the GNU General Public License
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+PRIVATE $pkgtotal AS Integer
+PRIVATE $currpkg AS Integer
PUBLIC $objPboxes AS NEW Object[]
PUBLIC $objUsrGroups AS NEW Object[]
PRIVATE iUID AS Integer
@@ -339,20 +341,6 @@
NEXT
NEXT
-
-
-
-
- tlStatus.Text = ("Extracting basic system structure.")
- FOR i = 0 TO sList.Max
- iret = ME.INSTALL_THIS_PACKAGE("/mnt/source/packages" &/
Trim(sList[i]))
- IF iret > 0 THEN RETURN iret
- pbProg.Value = (i + 1) / sList.Count
- WAIT 0.5
- NEXT
- RETURN 0
-
-
END
@@ -361,8 +349,7 @@
DIM pb AS PictureBox
DIM pb1 AS PictureBox
-
-
+
FOR EACH pb IN $objPboxes
IF pb.Tag = iStep THEN pb.Picture =
Picture.Load("images/16px-check.png")
FOR EACH pb1 IN $objPboxes
@@ -385,6 +372,7 @@
DIM $BulkArr, $PkgArr, $filearr AS String[]
DIM $pkgcnt, i, ii, iii, ires AS Integer
DIM sDump AS String
+ DIM cb AS CheckBox ' for the minimal install options
' Load file that defines package paths into a temp file
SHELL "cat /mnt/source/packages/CHECKSUMS.md5 | cut -f 2-10 -d \'.\'" TO
sDump
File.Save(Temp("pkgpaths"), Trim(sDump))
@@ -424,50 +412,67 @@
' X11,LXDE,DEV,ETC
' SOFTWARE SELECTION IN CLSGLOBAL.SPKGLISTTOINSTALL
' PKG1,PKG2,PKG3,PKG4,ETC
+ ' >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> CUSTOMIZED
INSTALLATION BEGINS HERE <<<<<<<<<<<<<<<<<<<<<<<<
$BulkArr = Split(Trim(ClsGlobal.sBulkListToInstall), ",")
$PkgArr = Split(Trim(ClsGlobal.sPkgListToInstall), ",")
' Get to total number of package to be installed... this will be
used for the progressbar
- FOR i = 0 TO $BulkArr.Max
- IF Trim($BulkArr[i]) THEN
+
+ 'WAIT 0.0125
'PRINT " -- Installing bulk-preset " & $BulkArr[i]
+ FOR i = 0 TO $BulkArr.Max
+ IF Trim($BulkArr[i]) THEN
TRY $file = Trim(File.Load("/mnt/source/veclinux" &/
$BulkArr[i])) ' read definition file
$filearr = Split(Trim($file), gb.NewLine)
$pkgcnt = $pkgcnt + $filearr.Count
END IF
NEXT
- ' Add the number of packages individually selected to the
count
- $pkgcnt = $pkgcnt + $PkgArr.Count
+ $pkgtotal = $pkgcnt + $PkgArr.Count
+ '
+
+ ' add individual packages to count
+ $pkgtotal = $pkgtotal + $PkgArr.Count
- 'This will loop through each bulk definition file, read it, and
process it's contents.
- FOR i = 0 TO $BulkArr.Max
+
+ FOR i = 0 TO $BulkArr.Max
IF Trim($BulkArr[i]) THEN
- PRINT " -- Installing bulk-preset " & $BulkArr[i]
- TRY $file = Trim(File.Load("/mnt/source/veclinux" &/
$BulkArr[i])) ' read definition file
- $filearr = Split($file, gb.NewLine)
- FOR ii = 0 TO $filearr.Max ' read each line in the file.
- INC iii
- ' install this package
-
- $path = ME.GET_PACKAGE_FULL_PATH($filearr[ii])
- IF $path THEN
- 'PRINT $path
- IF Exist("/mnt/source/packages" &/
Trim($path)) THEN
- PRINT $path
- tlStatus.Text = $path
- pbProg.Value = iii / $pkgcnt ' supposed to
update the progressbar
- WAIT 0.5
- ires =
ME.INSTALL_THIS_PACKAGE("/mnt/source/packages" &/ Trim($path))
- IF ires > 0 THEN
-
ClsGlobal.fRunningMainForm.btNext.enabled = TRUE
- RETURN 1
- BREAK ' this will never get executed
- END IF
- END IF
- END IF
- 'WAIT 0.5
- 'pbProg.Refresh
- NEXT
+ IF ME.INSTALL_THIS_BULK(tlStatus, pbProg,
Trim($BulkArr[i])) > 0 THEN
+ Message.Error(("Unable to install contents of") &
Space(1) & Trim($BulkArr[i]) & "." & Space(1) & ("Cannot continue"))
+ RETURN 1
+ BREAK
+ END IF
+ ' ' Add the number of packages individually selected to the
count
+ ' $pkgcnt = $pkgcnt + $PkgArr.Count
+ '
+ ' 'This will loop through each bulk definition file, read it,
and process it's contents.
+ ' FOR i = 0 TO $BulkArr.Max
+ ' IF Trim($BulkArr[i]) THEN
+ ' PRINT " -- Installing bulk-preset " & $BulkArr[i]
+ ' TRY $file = Trim(File.Load("/mnt/source/veclinux" &/
$BulkArr[i])) ' read definition file
+ ' $filearr = Split($file, gb.NewLine)
+ ' FOR ii = 0 TO $filearr.Max ' read each line in the
file.
+ ' INC iii
+ ' ' install this package
+ '
+ ' $path = ME.GET_PACKAGE_FULL_PATH($filearr[ii])
+ ' IF $path THEN
+ ' 'PRINT $path
+ ' IF Exist("/mnt/source/packages" &/
Trim($path)) THEN
+ ' PRINT $path
+ ' tlStatus.Text = $path
+ ' pbProg.Value = iii / $pkgcnt ' supposed to
update the progressbar
+ ' WAIT 0.5
+ ' ires =
ME.INSTALL_THIS_PACKAGE("/mnt/source/packages" &/ Trim($path))
+ ' IF ires > 0 THEN
+ '
ClsGlobal.fRunningMainForm.btNext.enabled = TRUE
+ ' RETURN 1
+ ' BREAK ' this will never get executed
+ ' END IF
+ ' END IF
+ ' END IF
+ ' 'WAIT 0.5
+ ' 'pbProg.Refresh
+ ' NEXT
END IF
NEXT
@@ -480,7 +485,7 @@
pbProg.Value = iii / $pkgcnt
IF $path THEN
IF Exist("/mnt/source/packages" &/ Trim($path)) THEN
- WAIT 0.5
+ WAIT 0.125
ires = ME.INSTALL_THIS_PACKAGE("/mnt/source/packages" &/
Trim($path))
IF ires > 0 THEN
ClsGlobal.fRunningMainForm.btNext.enabled = TRUE
@@ -492,31 +497,82 @@
'WAIT 1
NEXT
+ pbProg.Value = 1
ME.ADVANCE_INSTALL_PROGRESS(2)
Message.Info(("Installation is complete. Click") & Space(1) &
ClsGlobal.fRunningMainForm.btNext.text & Space(1) & ("to continue"))
ClsGlobal.fRunningMainForm.btNext.enabled = TRUE
tlStatus.Text = ("Installation complete... Click") & Space(1) &
ClsGlobal.fRunningMainForm.btNext.text & Space(1) & ("to continue.")
- RETURN
+ RETURN 0
FULL_INSTALL:
- Message("Full install not programmed yet")
- RETURN
+ ' >>>>>>>>>>>> FULL INSTALLATION BEGINS HERE
<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+ ' get package count first
+ FOR EACH $bulk IN Dir("/mnt/source/veclinux")
+ IF $bulk = "VINSTALL.CONF" THEN CONTINUE
+ IF $bulk = "VECLINUX" THEN CONTINUE
+ $BulkArr = Split(Trim(File.Load("/mnt/source/veclinux" &/
$bulk)), gb.NewLine)
+ $pkgtotal = $pkgtotal + $BulkArr.Count
+ NEXT
+
+ FOR EACH $bulk IN Dir("/mnt/source/veclinux")
+ IF $bulk = "VINSTALL.CONF" THEN CONTINUE ' skip the conf file
+ IF $bulk = "VECLINUX" THEN CONTINUE ' we already did veclinux
+ DEBUG "Processing " & $bulk
+ IF ME.INSTALL_THIS_BULK(tlStatus, pbProg, $bulk) > 0 THEN
+ Message.Error(("Unable to install the components of") &
Space(1) & $bulk & Space(1) & ("Unable to continue."))
+ RETURN 1
+ BREAK
+ END IF
+ NEXT
+ ME.ADVANCE_INSTALL_PROGRESS(2)
+
+ Message.Info(("Installation is complete. Click") & Space(1) &
ClsGlobal.fRunningMainForm.btNext.text & Space(1) & ("to continue"))
+ ClsGlobal.fRunningMainForm.btNext.enabled = TRUE
+ tlStatus.Text = ("Installation complete... Click") & Space(1) &
ClsGlobal.fRunningMainForm.btNext.text & Space(1) & ("to continue.")
+
+
+ RETURN 0
MINIMAL_INSTALL:
- 'Message("Minimal install not yet programmed")
- IF ClsGlobal.bInstallDev = TRUE THEN
- IF ME.INSTALL_THIS_BULK(tlStatus, pbProg, "DEV") > 0 THEN
- Message.Error(("Unable to install the software in the
development group. Cannot continue."))
- RETURN 1
- END IF
- END IF
- IF ClsGlobal.bInstallX11 = TRUE THEN
- IF ME.INSTALL_THIS_BULK(tlStatus, pbProg, "X11") > 0 THEN
- Message.Error(("Unable to install the software in the Graphical
Interface group. Cannot continue"))
- RETURN 1
- END IF
+
+ ' >>>>>>>>>>>>>> MINIMAL INSTALLATION BEGINS HERE
<<<<<<<<<<<<<<<<<<<<<<<<
+ ' count extra packages
+ FOR EACH cb IN ClsGlobal.objMinComponents
+ IF cb.Value = TRUE THEN
+ $BulkArr = Split(Trim(File.Load("/mnt/source/veclinux" &/
cb.Tag)), gb.NewLine)
+ $pkgtotal = $pkgtotal + $BulkArr.Count
END IF
- RETURN 0
+ NEXT
+
+ FOR EACH cb IN ClsGlobal.objMinComponents
+ IF cb.Value = TRUE THEN
+ IF ME.INSTALL_THIS_BULK(tlStatus, pbProg, cb.Tag) > 0 THEN
+ Message.Error(("Unable to install the components of") &
Space(1) & cb.Tag & Space(1) & ("Unable to continue."))
+ RETURN 1
+ BREAK
+ END IF
+ END IF
+ NEXT
+ ME.ADVANCE_INSTALL_PROGRESS(2)
+ Message.Info(("Installation is complete. Click") & Space(1) &
ClsGlobal.fRunningMainForm.btNext.text & Space(1) & ("to continue"))
+ ClsGlobal.fRunningMainForm.btNext.enabled = TRUE
+ tlStatus.Text = ("Installation complete... Click") & Space(1) &
ClsGlobal.fRunningMainForm.btNext.text & Space(1) & ("to continue.")
+
+
+ ' IF ClsGlobal.bInstallDev = TRUE THEN
+ ' IF ME.INSTALL_THIS_BULK(tlStatus, pbProg, "DEV") > 0 THEN
+ ' Message.Error(("Unable to install the software in the
development group. Cannot continue."))
+ ' RETURN 1
+ ' END IF
+ ' END IF
+ ' IF ClsGlobal.bInstallX11 = TRUE THEN
+ ' IF ME.INSTALL_THIS_BULK(tlStatus, pbProg, "X11") > 0 THEN
+ ' Message.Error(("Unable to install the software in the
Graphical Interface group. Cannot continue"))
+ ' RETURN 1
+ ' END IF
+ ' END IF
+ ' RETURN 0
RETURN 0
@@ -531,15 +587,20 @@
FOR i = 0 TO $list.Max
$path = ME.GET_PACKAGE_FULL_PATH($list[i])
IF $path THEN
- WAIT 0.5
- tlStatus.Text = ("Installing") & Space(1) & $path & Space(1)
& "(" & ("Part of") & sBulkName & ")"
+ 'WAIT 0.05
+ tlStatus.Text = ("Installing") & Space(1) & $path & Space(1)
& "(" & ("Part of") & Space(1) & sBulkName & ")"
IF ME.INSTALL_THIS_PACKAGE("/mnt/source/packages" &/ $path)
> 0 THEN
Message.Error(("Error installing") & Space(1) & $path)
RETURN 1
ELSE
- pbProg.Value = (i + 1) / $list.Max
+ 'pbProg.Value = (i + 1) / $list.Max
+ pbProg.Value = $currpkg / $pkgtotal
END IF
+ tlStatus.Parent.Parent.Refresh()
+ ClsGlobal.fRunningMainForm.Refresh()
+ WAIT 0.035
END IF
+ INC $currpkg
NEXT
@@ -555,7 +616,8 @@
DIM sBuff AS String
'$hproc = EXEC ["/sbin/installpkg ", "-R", ClsGlobal.sTargetPath,
sFullPkgPath] WAIT
- $hproc = SHELL "/sbin/installpkg -R " & ClsGlobal.sTargetPath &
Space(1) & sFullPkgPath WAIT 'TO sBuff
+ '$hproc = SHELL "/sbin/installpkg -R " & ClsGlobal.sTargetPath &
Space(1) & sFullPkgPath WAIT 'TO sBuff
+ $hproc = EXEC ["/sbin/installpkg", "-q", "-R", ClsGlobal.sTargetPath,
sFullPkgPath] WAIT
IF $hproc.Value > 0 THEN
DEBUG sFullPkgPath & Space(1) & "failed to install"
RETURN 1
Modified: branches/speedy/Step7.class
==============================================================================
--- branches/speedy/Step7.class (original)
+++ branches/speedy/Step7.class Wed May 13 14:15:01 2009
@@ -21,7 +21,8 @@
MdlMain.ADVANCE_STATUS_TREE("Step2", "Step3")
' ClsGlobal.fRunningMainForm.listview1["Step2"].picture =
MdlStartUp.pDone
' ClsGlobal.fRunningMainForm.listview1["Step3"].picture = MdlStartUp.pNow
-
+ ClsGlobal.objMinComponents.Add(ME.rbCliMin)
+ ClsGlobal.objMinComponents.Add(ME.rbMinDev)
END
PUBLIC FUNCTION GetNext() AS String
@@ -82,14 +83,3 @@
END
-PUBLIC SUB rbCliMin_Click()
-
- ClsGlobal.bInstallX11 = LAST.Value
-
-END
-
-PUBLIC SUB rbMinDev_Click()
-
- ClsGlobal.bInstallDev = LAST.Value
-
-END
Modified: branches/speedy/Step9.form
==============================================================================
--- branches/speedy/Step9.form (original)
+++ branches/speedy/Step9.form Wed May 13 14:15:01 2009
@@ -83,6 +83,7 @@
Spacing = 2
Padding = 2
Border = False
+ ScrollBar = Scroll.None
}
}
{ Frame2 Frame
|
