Menu
▾
▴
vectorlinux-devel
|
From: <cod...@go...> - 2008-11-17 23:59:58
|
Author: M0...@gm...
Date: Mon Nov 17 15:57:42 2008
New Revision: 298
Modified:
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/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/FMain.class
branches/iVL/FrmLilo.class
branches/iVL/FrmLiloSetup.class
branches/iVL/FrmNetConf.class
branches/iVL/FrmPartScheme.class
branches/iVL/FrmPartSel.class
branches/iVL/FrmPkgSel.class
branches/iVL/FrmRootPass.class
branches/iVL/FrmSelISO.class
branches/iVL/FrmSummary.class
branches/iVL/FrmUserAdd.form
branches/iVL/FrmUsrPkgSel.class
branches/iVL/FrmWinDrives.class
branches/iVL/FrmZoneSet.class
branches/iVL/MdlConfLilo.module
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlInstallSys.module
branches/iVL/MdlSetup.module
Log:
LILO still broken, added accidental double-click protection to next button
switched install processes to use EXEC instead of SHELL
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsGlobal.class
+# /home/remote/devel/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 Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsPartSel.class
+# /home/remote/devel/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 Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsWinDrives.class
+# /home/remote/devel/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 Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /home/remote/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,95 +14,95 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:191
+#: FMain.class:193
msgid "Restart"
msgstr ""
-#: FMain.class:240
+#: FMain.class:242
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:242
+#: FMain.class:244
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:242
+#: FMain.class:244
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:256
+#: FMain.class:258
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:311
+#: FMain.class:313
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:312
+#: FMain.class:314
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:319
+#: FMain.class:321
msgid "Skipping boot loaded setup"
msgstr ""
-#: FMain.class:342
+#: FMain.class:344
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:356
+#: FMain.class:358
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:371
+#: FMain.class:373
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:371
+#: FMain.class:373
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:371
+#: FMain.class:373
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:371
+#: FMain.class:373
msgid "Yes"
msgstr ""
-#: FMain.class:371
+#: FMain.class:373
msgid "No"
msgstr ""
-#: FMain.class:389
+#: FMain.class:391
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:393
+#: FMain.class:395
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:408
+#: FMain.class:410
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:408
+#: FMain.class:410
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:660
+#: FMain.class:662
msgid "Back"
msgstr ""
-#: FMain.class:672
+#: FMain.class:674
msgid "Exit Installation"
msgstr ""
-#: FMain.class:684
+#: FMain.class:686
msgid "Next"
msgstr ""
-#: FMain.class:698
+#: FMain.class:700
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmDiskPart.class
+# /home/remote/devel/installer/FrmDiskPart.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 Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartScheme.class
+# /home/remote/devel/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -26,27 +26,27 @@
msgid "Use this option if you already prepared your partitions using the
VectorLinux installer"
msgstr ""
-#: FrmPartScheme.class:70
+#: FrmPartScheme.class:71
msgid "Select this option is you wish to create, more or resize partitions
in order to make room for your new VectorLinux installation."
msgstr ""
-#: FrmPartScheme.class:70
+#: FrmPartScheme.class:71
msgid "This option is the safest choice if you have other existing
installations that you wish to keep."
msgstr ""
-#: FrmPartScheme.class:112
+#: FrmPartScheme.class:113
msgid "Disk Partitioning Options"
msgstr ""
-#: FrmPartScheme.class:117
+#: FrmPartScheme.class:118
msgid "Use existing disk partitions"
msgstr ""
-#: FrmPartScheme.class:122
+#: FrmPartScheme.class:123
msgid "Modify my disk partitions to make room for new installation"
msgstr ""
-#: FrmPartScheme.class:127
+#: FrmPartScheme.class:128
msgid "TextLabel1"
msgstr ""
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartSel.class
+# /home/remote/devel/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,75 +14,75 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "Linux is a modular operating system. This means that is has the
ability to store system and"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "user data separately for added data security. You may install the
system to a single partition"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "by simply selecting a \"/\" value on this screen. The rest is
optional. The following is a"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "suggested setup for a typical Linux installation"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "Used to store system data. This particular install requires a
minimum of"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "for this"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "but you should considear a higher value to make sure you have room
to install additional software"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "in case you wish to."
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "Used to store user documents, pictures, videos. Give yourself as
much room as you want"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "Typically, you want to use the largest partition for this."
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "Using a swap partition is suggested if your total RAM is less than
1GB. Suggested ammount"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "for this is"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "but can also be calculated as 2 times your ammount of RAM"
msgstr ""
-#: FrmPartSel.class:180
+#: FrmPartSel.class:181
msgid "Please select the partitions you wish to use and how to use them"
msgstr ""
-#: FrmPartSel.class:185
+#: FrmPartSel.class:186
msgid "Help"
msgstr ""
-#: FrmPartSel.class:205
+#: FrmPartSel.class:206
msgid "Check this box if you have a Windows installation on your system or
any other windows partition (FAT, FAT32, NTFS) that you want auto-mounted
as soon as your computer starts"
msgstr ""
-#: FrmPartSel.class:206
+#: FrmPartSel.class:207
msgid "Detect and Setup Windows partitions for auto-mounting at boot"
msgstr ""
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPkgSel.class
+# /home/remote/devel/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -30,23 +30,23 @@
msgid "Size"
msgstr ""
-#: FrmPkgSel.class:70
+#: FrmPkgSel.class:71
msgid "Installs all optional components in your VectorLinux media to your
system"
msgstr ""
-#: FrmPkgSel.class:80
+#: FrmPkgSel.class:81
msgid "Choose your optional components to install."
msgstr ""
-#: FrmPkgSel.class:195
+#: FrmPkgSel.class:196
msgid "TextLabel1"
msgstr ""
-#: FrmPkgSel.class:205
+#: FrmPkgSel.class:206
msgid "Full Install"
msgstr ""
-#: FrmPkgSel.class:210
+#: FrmPkgSel.class:211
msgid "Custom Install"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSelISO.class
+# /home/remote/devel/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -18,43 +18,43 @@
msgid "No Installable Media Found"
msgstr ""
-#: FrmSelISO.class:74
+#: FrmSelISO.class:79
msgid "Click"
msgstr ""
-#: FrmSelISO.class:74
+#: FrmSelISO.class:79
msgid "to begin installating"
msgstr ""
-#: FrmSelISO.class:76
+#: FrmSelISO.class:81
msgid "Unable to locate any installable media."
msgstr ""
-#: FrmSelISO.class:82
+#: FrmSelISO.class:87
msgid "Select installation media from the list below"
msgstr ""
-#: FrmSelISO.class:113
+#: FrmSelISO.class:116
msgid "Unable to identify distro."
msgstr ""
-#: FrmSelISO.class:148
+#: FrmSelISO.class:151
msgid "Minimum Disk Space Requirements"
msgstr ""
-#: FrmSelISO.class:251
+#: FrmSelISO.class:254
msgid "No installable images found."
msgstr ""
-#: FrmSelISO.class:257
+#: FrmSelISO.class:260
msgid "Select which VectorLinux version you wish to install from the list
below"
msgstr ""
-#: FrmSelISO.class:262
+#: FrmSelISO.class:265
msgid "TextLabel1"
msgstr ""
-#: FrmSelISO.class:267
+#: FrmSelISO.class:270
msgid "Search Again"
msgstr ""
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /home/remote/devel/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 Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmWinDrives.class
+# /home/remote/devel/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 Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlCore.module
+# /home/remote/devel/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 Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlDiskPart.module
+# /home/remote/devel/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 Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlObjSizer.module
+# /home/remote/devel/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 Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPartSel.module
+# /home/remote/devel/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 Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPkgSel.module
+# /home/remote/devel/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 Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSetup.module
+# /home/remote/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -26,15 +26,15 @@
msgid "Total pkgs to be installed = "
msgstr ""
-#: MdlSetup.module:304
+#: MdlSetup.module:300
msgid "BROUGHT TO YOU BY"
msgstr ""
-#: MdlSetup.module:320
+#: MdlSetup.module:316
msgid "Activating swap space"
msgstr ""
-#: MdlSetup.module:322
+#: MdlSetup.module:318
msgid "Preparing filesystems"
msgstr ""
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSummarize.module
+# /home/remote/devel/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 Mon Nov 17 15:57:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlWinDrives.module
+# /home/remote/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Mon Nov 17 15:57:42 2008
@@ -187,6 +187,8 @@
DIM sLang AS String
'tvPlan.Refresh()
+ FMain.btnext.Enabled = FALSE
+
IF LAST.TEXT = ("Restart") THEN
'EXEC "shutdown", "-r", " now"
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Mon Nov 17 15:57:42 2008
@@ -50,6 +50,7 @@
MdlLiloOsList.list_boot_options()
ME.tsOsSetup.Index = 0
ME.cbDefBoot.Text = "Linux"
+FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class (original)
+++ branches/iVL/FrmLiloSetup.class Mon Nov 17 15:57:42 2008
@@ -36,6 +36,7 @@
MdlLilo.LIST_WIN_INSTALLS()
ME.CLEANUP_TABSTRIP()
MdlLilo.LIST_DEFAULT_BOOT_OPTIONS() ' initial list
+ FMain.btnext.Enabled = TRUE
END
PUBLIC SUB CLEANUP_TABSTRIP()
Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class (original)
+++ branches/iVL/FrmNetConf.class Mon Nov 17 15:57:42 2008
@@ -68,6 +68,7 @@
cb.Refresh
NEXT
ME.frmNetDevices.Text = Space(1) & ("Network Interfaces") & Space(1)
+ FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class (original)
+++ branches/iVL/FrmPartScheme.class Mon Nov 17 15:57:42 2008
@@ -60,6 +60,7 @@
"<b>" & ("This option will overwrite any existing data in the selected
partitions") & "</b><br><br>" &
"<i>" & ("Use this option if you already prepared your partitions using
the VectorLinux installer") & "</i> "
FMain.frmNext = FrmPartSel
+ FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Mon Nov 17 15:57:42 2008
@@ -55,6 +55,8 @@
ME.tlBanner.text = "<h3>" & tlBanner.text & "</h3>"
FMain.FrmCurr = ME
+ FMain.tvPlan["Prep2"].Selected = TRUE
+ FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic
ME.btHelp.Width = MdlObjSizer.get_object_width(btHelp.text) + 32
ME.Resize(ME.Parent.Width, ME.Parent.Height - (ME.cbDoWin.height * 3))
ME.tlBanner.Adjust
@@ -64,9 +66,8 @@
ClsPartSel.bDoWin = FALSE
FMain.btback.Enabled = TRUE
FMain.btback.ForeColor = Color.Black
- FMain.tvPlan["Prep2"].Selected = TRUE
- FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic
+FMain.btnext.Enabled = TRUE
END
PUBLIC SUB Form_Hide()
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Mon Nov 17 15:57:42 2008
@@ -46,6 +46,7 @@
END WITH
ME.FILL_IN_BULK_LIST()
+FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class (original)
+++ branches/iVL/FrmRootPass.class Mon Nov 17 15:57:42 2008
@@ -2,6 +2,12 @@
PUBLIC SUB Form_Open()
Fmain.frmcurr = ME
+
+ WITH FMain
+ .tvPlan["Conf1"].Picture = MdlCore.sDonePic
+ .tvPlan["Conf2"].picture = MdlCore.sNowPic
+ .tvPlan["Conf2"].Selected = TRUE
+ END WITH
WITH ME
.tlbanner.text = "<h3>" & ("System Administrator Password") & "</h3>"
.tlBanner.Width = MdlObjSizer.get_object_width(.tlBanner.text)
@@ -20,12 +26,8 @@
.Button1.Visible = FALSE
END WITH
- WITH FMain
- .tvPlan["Conf1"].Picture = MdlCore.sDonePic
- .tvPlan["Conf2"].picture = MdlCore.sNowPic
- .tvPlan["Conf2"].Selected = TRUE
- END WITH
ME.Frame1.text = Space(1) & ("About the root account") & Space(1)
+ FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Mon Nov 17 15:57:42 2008
@@ -53,6 +53,11 @@
ME.tlBanner.text = "<h3>" & tlBanner.text & "</h3>"
+ FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic
+ FMain.tvPlan["Prep1"].Picture = MdlCore.sNowPic
+ FMain.tvPlan["Prep1"].Selected = TRUE
+
+
ME.Width = ME.Parent.Width
ME.Height = ME.Parent.Height
ME.btResCan.Height = ME.lstInstallableImg.Height
@@ -87,10 +92,8 @@
.btnext.ForeColor = Color.Black
END WITH
END IF
- FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic
- FMain.tvPlan["Prep1"].Picture = MdlCore.sNowPic
- FMain.tvPlan["Prep1"].Selected = TRUE
-
+
+FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Mon Nov 17 15:57:42 2008
@@ -23,7 +23,7 @@
'ME.GridView2.Visible = FALSE
END IF
ME.prepare_partition_summary()
-
+ FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form (original)
+++ branches/iVL/FrmUserAdd.form Mon Nov 17 15:57:42 2008
@@ -8,7 +8,7 @@
Text = ("Choose a unique name for each user. Enter the password for
twice for accuracy. You can make as many users as you want, and when you
are finished click next to continue.")
}
{ tbUsername TextBox
- MoveScaled(16,18,15,3)
+ MoveScaled(17,18,15,3)
Tag = "line1"
Text = ("")
}
@@ -87,10 +87,10 @@
Text = ("")
}
{ hrSep Separator
- MoveScaled(30,8,12,1)
+ MoveScaled(22,7,12,1)
}
{ pbUsrPic PictureBox
- MoveScaled(58,21,8,8)
+ MoveScaled(35,19,8,8)
Stretch = True
}
{ tlRealName TextLabel
Modified: branches/iVL/FrmUsrPkgSel.class
==============================================================================
--- branches/iVL/FrmUsrPkgSel.class (original)
+++ branches/iVL/FrmUsrPkgSel.class Mon Nov 17 15:57:42 2008
@@ -24,6 +24,7 @@
END WITH
ME.LIST_PACKAGES
+FMain.btnext.Enabled = TRUE
END
PUBLIC SUB LIST_PACKAGES()
Modified: branches/iVL/FrmWinDrives.class
==============================================================================
--- branches/iVL/FrmWinDrives.class (original)
+++ branches/iVL/FrmWinDrives.class Mon Nov 17 15:57:42 2008
@@ -26,7 +26,7 @@
FMain.btback.Enabled = TRUE
FMain.btback.ForeColor = Color.Black
-
+FMain.btnext.Enabled = TRUE
END
PUBLIC SUB Form_Resize()
Modified: branches/iVL/FrmZoneSet.class
==============================================================================
--- branches/iVL/FrmZoneSet.class (original)
+++ branches/iVL/FrmZoneSet.class Mon Nov 17 15:57:42 2008
@@ -28,6 +28,7 @@
FMain.btnext.Enabled = FALSE
MdlZoneSet.TIME_ZONES()
'ME.lbTmZone.Index = 9
+ FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Mon Nov 17 15:57:42 2008
@@ -301,6 +301,7 @@
DIM sOut AS String
DIM cb AS CheckBox
+ DIM cbox AS ComboBox
' SHELL "mount -o bind /sys " & ClsGlobal.sTargetMnt &/ "sys" WAIT
EXEC ["mount", "-o", "bind", "/sys", ClsGlobal.sTargetMnt &/ "sys"] WAIT
' SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT
@@ -312,9 +313,9 @@
' Mount home directory for user accounts
- FOR EACH cb IN MdlPartSel.oMountPoints
- IF cb.Text = "/home" THEN
- EXEC ["mount", cb.Tag, ClsGlobal.sTargetMnt &/ "home"] WAIT
+ FOR EACH cbox IN MdlPartSel.oMountPoints
+ IF cbox.Text = "/home" THEN
+ EXEC ["mount", CStr(cbox.Tag), ClsGlobal.sTargetMnt &/ "home"] WAIT
END IF
NEXT
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Mon Nov 17 15:57:42 2008
@@ -168,85 +168,6 @@
END
-' ' PUBLIC FUNCTION INSTALL_CONF_PACKAGES() AS Integer
-' '
-' ' DIM sOutput, sLine, sPkg, sPkgPath AS String
-' ' 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
-' ' END
-
-
-' ' ' PUBLIC FUNCTION INSTALL_PACKAGES_REQUIRED() AS Integer
-' ' '
-' ' ' DIM i, iRet AS Integer
-' ' ' DIM sPkg AS String
-' ' ' DIM sDump AS String
-' ' ' DIM ii AS Integer
-' ' ' FOR EACH spkg IN RDir(ClsGlobal.sSetupConfPath &/ "packages"
&/ "required", "t?z")
-' ' ' INC ii
-' ' ' NEXT
-' ' '
-' ' ' i = 0
-' ' ' FOR EACH sPkg IN RDir(ClsGlobal.sSourceMnt &/ "packages"
&/ "required")
-' ' ' SELECT CASE File.Ext(ClsGlobal.sSourceMnt &/ "packages"
&/ "required" &/ sPkg)
-' ' ' CASE "tlz", "tgz"
-' ' ' INC i
-' ' ' PRINT " + Install " & ClsGlobal.sSourceMnt &/ "packages"
&/ "required" &/ sPkg
-' ' ' 'iret = ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt
&/ "packages" &/ "required" &/ sPkg)
-' ' ' SHELL "echo \"\" > /tmp/installdump" WAIT
-' ' '
-' ' ' hproc = SHELL "installpkg " & ClsGlobal.sSourceMnt
&/ "packages" &/ "required" &/ sPkg & " -R " & ClsGlobal.sTargetMnt & " ||
echo \'FAILED\' 2> /tmp/installdump"
-' ' ' WAIT 1
-' ' ' IF hproc.State = Process.Running THEN
-' ' ' REPEAT
-' ' ' WAIT
-' ' ' UNTIL hproc.State = Process.Stopped
-' ' ' END IF
-' ' ' sDump = File.Load("/tmp/installdump")
-' ' ' IF InStr(sDump, "FAILED") THEN
-' ' ' RETURN 1
-' ' ' END IF
-' ' '
-' ' ' PRINT " ! " & ClsGlobal.sSourceMnt &/ "packages" &/ "required"
&/ sPkg & " is installed"
-' ' ' FrmInstallSys.pbInstallProg.Value = i / ii
-' ' '
-' ' ' INC iPkgNum
-' ' '
-' ' ' FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
-' ' ' END SELECT
-' ' ' NEXT
-' ' ' END
PUBLIC FUNCTION INSTALL_USER_PACKAGES() AS Integer
@@ -341,7 +262,8 @@
SHELL "echo \"\" > /tmp/installdump" WAIT
'Message.Info(sBasePath &/ cb.tag)
FrmInstallSys.tlCurrPkg.Text = ("Installing user-selected
package") & Space(1) & File.Name(sBasePath &/ cb.Tag)
- hproc = SHELL "installpkg " & sBasePath &/ cb.tag & Space(1)
& "-R" & Space(1) & ClsGlobal.sTargetMnt & Space(1) & "|| echo \'FAILED\'
2> /tmp/installdump" 'WAIT
+ 'hproc = SHELL "installpkg " & sBasePath &/ cb.tag & Space(1)
& "-R" & Space(1) & ClsGlobal.sTargetMnt & Space(1) & "|| echo \'FAILED\'
2> /tmp/installdump" 'WAIT
+ hproc = EXEC ["installpkg", sBasePath &/ cb.tag, "-R",
ClsGlobal.sTargetMnt]
'
WAIT 1
IF hproc.State = Process.running THEN
@@ -349,14 +271,15 @@
WAIT
UNTIL hproc.State = Process.Stopped
END IF
- sDump = File.Load("/tmp/installdump")
+ 'sDump = File.Load("/tmp/installdump")
' update step progress
INC i
FrmInstallSys.pbInstallProg.Value = i / iStepTotal
INC iPkgNum
'MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
- IF InStr(sDump, "FAILED") > 0 THEN
+ 'IF InStr(sDump, "FAILED") > 0 THEN
+ IF hproc.Value > 0 THEN
Message.Error("Error installing user-selected package" &
Space(1) & cb.Text)
RETURN 1
' ELSE
@@ -369,136 +292,6 @@
NEXT
'Message.Info("End installation of user selected software")
END
-' '
-' '
-' '
-' '
-' ' DIM i AS Integer
-' ' DIM sFile AS String[]
-' ' DIM sLine AS String
-' ' DIM sRawFile AS String
-' ' DIM sTlzPath AS String
-' ' DIM sTlzName AS String
-' ' DIM sTlzDesc AS String
-' ' DIM iTlzSize AS Integer
-' ' DIM sTlzBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"
-' ' DIM sTargetSize AS Variant
-' ' DIM cb AS CheckBox
-' ' DIM sName AS String
-' '
-' ' sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT"))
-' '
-' ' sFile = Split(sRawFile, "\n")
-' '
-' ' FOR EACH cb IN MdlPkgSel.Pkgs
-' ' sName = Trim(cb.text)
-' '
-' '
-' ' FOR i = 0 TO sFile.count - 1
-' ' sLine = Trim(sFile[i])
-' ' IF InStr(sLine, sName) THEN
-' ' IF Left(sLine, Len("PACKAGE NAME")) = "PACKAGE NAME" THEN
-' ' sTlzName = Trim(Right(sLine, Len(sLine) -
InStr(sLine, ":")))
-' ' sTlzPath = Trim(Right(sFile[i + 1], Len(sFile[i + 1]) -
InStr(sFile[i + 1], ":")))
-' ' sTlzPath = Right(sTlzPath, Len(sTlzPath) - 2) ' remove
the ./ from the location line
-' ' iTlzSize = Trim(Right(sFile[i + 3], Len(sFile[i + 3]) -
InStr(sFile[i + 3], ":")))
-' ' 'iTlzSize = Left(iTlzSize, Len(iTlzSize) - 1)
-' ' 'iTlzSize = Trim(iTlzSize)
-' ' FrmInstallSys.tlCurrPkg.Text = "Installing " & sTlzName
& " ..."
-' ' FrmInstallSys.pbInstallProg.Value = 0.0
-' '
-' ' 'IF sTlzName = sName THEN
-' ' Message.Info(sTlzName)
-' ' 'RETURN
-' '
-' ' PRINT " Install " & sTlzBasePath &/ sTlzPath &/ sTlzName
-' ' ' install each package
-' ' SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & "
) && echo $gsize | cut -f3 -d \' \'" TO sTargetSize
-' ' sTargetSize = Trim(CStr(sTargetSize))
-' ' SHELL "echo \"\" > /tmp/installdump" WAIT
-' ' sDump = ""
-' ' sErr = ""
-' ' 'hproc = SHELL "install-pkg " & sTlzBasePath &/ sTlzPath
&/ sTlzName & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR
READ
-' ' hproc = SHELL "installpkg " & sTlzBasePath &/ sTlzPath
&/ sTlzName & " -R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>
/tmp/installdump" WAIT 'FOR READ
-' ' WAIT 1
-' ' IF hproc.State = Process.Running THEN
-' ' REPEAT
-' ' WAIT 1
-' ' MdlInstallSys.UPDATE_STEP_PROGRESS(sTargetSize,
iTlzSize)
-' '
-' ' ' figure out the progress again
-' '
-' ' UNTIL
-' ' hproc.State = Process.Stopped
-' ' sDump = File.Load("/tmp/installdump")
-' '
-' ' IF InStr(sDump, "FAILED") > 0 THEN
-' ' ERROR
-' ' RETURN 1
-' ' ELSE
-' ' IF FrmInstallSys.pbInstallProg.Value <> 1
THEN
-' ' FrmInstallSys.pbInstallProg.Value = 1
-' ' END IF
-' ' END IF
-' ' END IF
-' ' INC iPkgNum
-' ' FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
-' ' END IF
-' ' END IF
-' ' NEXT
-' ' NEXT
-' ' END
-' '
-' '
-' '
-' '
-' ' ' ' ' PUBLIC FUNCTION INSTALL_USER_SELECTED_PACKAGES_OLD() AS Integer
-' ' ' ' '
-' ' ' ' ' DIM i, iret AS Integer
-' ' ' ' ' DIM sPkg AS String
-' ' ' ' ' DIM cb AS CheckBox
-' ' ' ' ' DIM sPkgPath AS String = ClsGlobal.sSourceMnt &/ "packages"
-' ' ' ' ' DIM sPkgLoc AS String
-' ' ' ' ' DIM sFile AS String[]
-' ' ' ' ' DIM sLine AS String
-' ' ' ' ' DIM sConfig AS String
-' ' ' ' ' DIM ii AS Integer
-' ' ' ' ' ' needs to read PACKAES.TXT to get package name and
location
-' ' ' ' '
-' ' ' ' ' 'sFile = Split(File.Load(ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT"), "\n")
-' ' ' ' ' ii = 0
-' ' ' ' ' sConfig = "WORKINGDIR=" & ClsGlobal.sTargetMnt &/ "home"
&/ "ftp" &/ "pub" &/ "veclinux" & "\n" &
-' ' ' ' ' "SOURCE=" & ClsGlobal.sSourceMnt &/ "packages"
-' ' ' ' '
-' ' ' ' ' File.Save(Temp("sources"))
-' ' ' ' ' IF Exist(ClsGlobal.sTargetMnt &/ "home/ftp/pub/veclinux")
= FALSE THEN
-' ' ' ' ' MKDIR ClsGlobal.sTargetMnt &/ "home/ftp/pub/veclinux"
-' ' ' ' ' END IF
-' ' ' ' ' SHELL "slapt-get -u -c " & Temp("sources") WAIT
-' ' ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
-' ' ' ' ' IF cb.value = TRUE THEN
-' ' ' ' ' 'spkg = cb.Text
-' ' ' ' ' INC ii
-' ' ' ' ' NEXT
-' ' ' ' '
-' ' ' ' ' ' now to install them
-' ' ' ' '
-' ' ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
-' ' ' ' ' IF cb.Value = TRUE THEN
-' ' ' ' ' sPkg =
-' ' ' ' '
-' ' ' ' '
-' ' ' ' ' 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
@@ -520,122 +313,9 @@
UNTIL ii = FrmPkgSel.scrlInstallOpts.Rows.Count
-
-' ' ' '
-' ' ' '
-' ' ' ' 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, ii AS Integer
-' DIM irs AS Integer
-' DIM sOutput AS String
-' DIM sOutArr AS String[]
-' DIM cb AS CheckBox
-'
-'
-' 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
-' 'add bulks to ClsGlobal.iBulkCnt
-' ClsGlobal.iBulkCnt = i
-' '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
-' 'add pkgs TO ClsGlobal.iPkgCnt
-' ClsGlobal.iPkgCnt = 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
-' 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
-' ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + sOutArr.Count
-' ELSE
-' i = i + 1
-' 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
-' ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + 1
-' END IF
-' 'Count user-selected stuff in
-'
-' REPEAT
-' IF FrmPkgSel.scrlInstallOpts[ii, 0].Picture = FrmPkgSel.pyes
THEN INC irs
-' INC ii
-' UNTIL ii = FrmPkgSel.scrlInstallOpts.Rows.Count
-' i = i + irs
-' 'add bulks to ClsGlobal.iBulkCnt
-' ClsGlobal.iBulkCnt = ClsGlobal.iBulkCnt + irs
-'
-'
-' ' ' ' ' 'we will need to cycle through the arrays for th is for
accuracy...
-' ' ' ' ' irs = 0
-' ' ' ' ' FOR EACH cb IN MdlPkgSel.Bulks
-' ' ' ' ' IF cb.value = TRUE THEN INC irs
-' ' ' ' '
-' ' ' ' '
-' ' ' ' ' NEXT
-' ' ' ' ' i = i + irs
-' ' now do the optional packages
-' irs = 0 ' reset the count
-'
-' REPEAT
-' IF FrmUsrPkgSel.GridView1[ii, 0].Picture = FrmUsrPkgSel.pYes
THEN
-' INC irs
-' END IF
-' INC ii
-' UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count
-'
-'
-' ' ' ' ' ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
-' ' ' ' ' ' ' ' IF cb.Value = TRUE THEN INC irs
-' ' ' ' ' ' ' '
-' ' NEXT
-' i = i + irs ' the count to the total
-' 'i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count
-' 'add pkgs TO ClsGlobal.iPkgCnt
-' ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + irs
-' iPkgCnt = i
-' PRINT ("Total packages to be installed = ") & i
-' fPbInc = 1 / iPkgCnt
-' PRINT "The total progrssbar will work in increments of " & fPbInc & "
on every package installed"
-' PRINT ("Total bulks to be installed = ") & ClsGlobal.iBulkCnt
-' fPbInc = 0.6 / ClsGlobal.iBulkCnt
-' PRINT "The total progrssbar will work in increments of " & fPbInc & "
on every bulk installed"
-' PRINT ("Total pkgs to be installed = ") & ClsGlobal.iPkgCnt
-' fPbInc = 0.4 / ClsGlobal.iPkgCnt
-' PRINT "The total progrssbar will work in increments of " & fPbInc & "
on every pkg installed"
-'
-' END
-
-
PUBLIC FUNCTION INSTALL_REQUIRED_BULKS() AS Integer
DIM sOutput AS String
@@ -767,7 +447,8 @@
FrmInstallSys.tlCurrPkg.Text = "Processing " & File.Name(sPackagePath)
'hproc = SHELL "install-pkg " & sPackagePath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
IF Right(sPackagePath, 3) LIKE "t?z" THEN
- hproc = SHELL "installpkg " & sPackagePath & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump" 'FOR READ
+ 'hproc = SHELL "installpkg " & sPackagePath & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump" 'FOR READ
+ hproc = EXEC ["installpkg", sPackagePath, "-R", ClsGlobal.sTargetMnt]
ENDIF
WAIT 1
IF hproc.State = Process.Running THEN
@@ -782,9 +463,10 @@
UNTIL
hproc.state = Process.Stopped
' now do the error checking here and return a value
- sDump = File.Load("/tmp/installdump")
+ 'sDump = File.Load("/tmp/installdump")
- IF InStr(sDump, "FAILED") > 0 THEN
+ 'IF InStr(sDump, "FAILED") > 0 THEN
+ IF hproc.Value > 0 THEN
'ERROR HAS OCCURRED
RETURN 1
ELSE
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Mon Nov 17 15:57:42 2008
@@ -399,7 +399,8 @@
'ME.PACKAGE_INSTALL(ClsGlobal.sSourceMnt &/ "packages"
&/ sPkgPath &/ sPkgName)
' move the process here locally
SHELL "echo \"\" /tmp/installdump" WAIT
- hproc = SHELL "installpkg " &
ClsGlobal.sSourceMnt &/ "packages" &/ sPkgPath &/ sPkgName & " -R " &
ClsGlobal.sTargetMnt & " 2> /tmp/installdump"
+ 'hproc = SHELL "installpkg " &
ClsGlobal.sSourceMnt &/ "packages" &/ sPkgPath &/ sPkgName & " -R " &
ClsGlobal.sTargetMnt & " 2> /tmp/installdump"
+ hproc = EXEC ["installpkg", ClsGlobal.sSourceMnt
&/ "packages" &/ sPkgPath &/ sPkgName, "-R", ClsGlobal.sTargetMnt]
WAIT
IF hproc.State = Process.Running THEN
REPEAT
@@ -409,7 +410,8 @@
UNTIL
hproc.State = Process.Stopped
END IF
- IF InStr(sDump, "FAILED") > 0 THEN
+ 'IF InStr(sDump, "FAILED") > 0 THEN
+ IF hproc.value > 0 THEN
PRINT sPkgName & " failed to install "
RETURN 1
ELSE
@@ -761,7 +763,7 @@
DIM iTlzTotal AS Integer = 0
DIM iCurrTlz AS Integer '= 0
MdlCore.LOCK_GUI()
- SHELL "echo \"\" > /tmp/installdump" WAIT
+ 'SHELL "echo \"\" > /tmp/installdump" WAIT
'sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT"))
'/ NO PACKAGE SIZE DATA AVAILABLE FOR PACKAGES/REQUIRED.
@@ -778,9 +780,12 @@
sTlzName = File.Name(sTlzPath)
FrmInstallSys.pbInstallProg.Value = i / iTlzTotal
' clear the dump
- SHELL "echo \' \' > /tmp/installdump" WAIT
+ 'SHELL "echo \' \' > /tmp/installdump" WAIT
+ 'EXEC "echo", " ", "/tmp/installdump"] WAIT
FrmInstallSys.tlCurrPkg.Text = ("Installing Required
Package ...") & sTlzName
- hproc = SHELL "installpkg " & sTlzPath & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'"
+ 'hproc = SHELL "installpkg " & sTlzPath & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'"
+ hproc = EXEC ["installpkg", sTlzPath, "-R",
ClsGlobal.sTargetMnt]
+ 'hproc = exec
["installpkg",sTlzPath,"-R",ClsGlobal.sTargetMnt
WAIT
IF hproc.State = Process.Running THEN
REPEAT
@@ -788,8 +793,9 @@
UNTIL hproc.State = Process.Stopped
END IF
sDump = ""
- sDump = File.Load("/tmp/installdump")
- IF InStr(sDUmp, "FAILED") > 0 THEN
+ 'sDump = File.Load("/tmp/installdump")
+ ' IF InStr(sDUmp, "FAILED") > 0 THEN
+ IF hproc.Value > 0 THEN
Message.Error(sTlzName & Space(1) & ("Failed to
install"))
RETURN 1
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Mon Nov 17 15:57:42 2008
@@ -271,11 +271,7 @@
DIM sFile AS String[] = Split(sCreditFile, "\n")
DIM i AS Integer
tlOutput.Text = ""
-
- ' File.Save(Temp("Credits"), DConv(File.Load("/CREDIT")))
- ' sCreditFile = File.Load(Temp("Credits"))
- ' sFile = Split(sCreditFile, "\n")
-
+
FOR i = 0 TO sFile.count - 1
IF Left(Trim(sFile[i]), Len("M0E-lnx")) = "M0E-lnx" THEN
sFile[i] = "M0E-lnx [ vpackager, vasmCC, GUI installer ]"
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X