Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r69 - in branches/iVL: . .lang images
|
From: <cod...@go...> - 2008-07-23 22:03:14
|
Author: M0...@gm...
Date: Wed Jul 23 14:59:48 2008
New Revision: 69
Added:
branches/iVL/images/installer-steel.png (contents, props changed)
Modified:
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/FMain.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/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/FrmHostPrep.class
branches/iVL/FrmHostPrep.form
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/FrmPartScheme.form
branches/iVL/FrmPkgSel.class
branches/iVL/FrmPkgSel.form
branches/iVL/FrmSummary.class
branches/iVL/FrmSummary.form
branches/iVL/FrmWinDrives.form
branches/iVL/MdlInstallSys.module
branches/iVL/images/installer.png
Log:
Attempt to install bulks... not coming up so easily.Need to figure out
a way to parse the full command to the linux shell. FIXME. Trying out
new graphic for installer logo. Small cosmetic fixes
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/ClsPartSel.class
+# /home/moises/area-51/projects/installer/ClsPartSel.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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FMain.class
+# /home/moises/area-51/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,23 +14,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:244
+#: FMain.class:245
msgid "Process Overview"
msgstr ""
-#: FMain.class:258
+#: FMain.class:259
msgid "VectorLinux Install"
msgstr ""
-#: FMain.class:269
+#: FMain.class:270
msgid "Next"
msgstr ""
-#: FMain.class:275
+#: FMain.class:276
msgid "Back"
msgstr ""
-#: FMain.class:281
+#: FMain.class:282
msgid "Exit"
msgstr ""
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPkgSel.class
+# /home/moises/area-51/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,15 +14,15 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPkgSel.class:98
+#: FrmPkgSel.class:99
msgid "TextLabel1"
msgstr ""
-#: FrmPkgSel.class:104
+#: FrmPkgSel.class:105
msgid "Full Install"
msgstr ""
-#: FrmPkgSel.class:109
+#: FrmPkgSel.class:110
msgid "Custom Install"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmSummary.class
+# /home/moises/area-51/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,7 +14,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmSummary.class:80
+#: FrmSummary.class:87
msgid "TextLabel1"
msgstr ""
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlDiskPart.module
+# /home/moises/area-51/projects/installer/MdlDiskPart.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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlWinDrives.module
+# /home/moises/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -102,7 +102,8 @@
.tvPlan.Move(4, 24, .Frame1.Width - 8, .Frame1.Height - 28) ' THIS
WILL LEAVE 16PIX ON TOP AND BOTTOM AND 2 ON LEFT AND RIGHT
'.tvPlan.Move(4, 24, .Frame1.Width - 8, Frame1.Height -
(.Frame1.Height / 20))
- .pnlWinHost.Move(.Frame1.left + .Frame1.Width + 4, .Frame1.top +
(.tlBanner.Height / 2), .tlBanner.Width - (.Frame1.Width +
8), .ClientHeight - (.tlbanner.height + (.btback.height * 3.5)))
+ '.pnlWinHost.Move(.Frame1.left + .Frame1.Width + 4, .Frame1.top +
(.tlBanner.Height / 2), .tlBanner.Width - (.Frame1.Width +
8), .ClientHeight - (.tlbanner.height + (.btback.height * 3.5)))
+ .pnlWinHost.Move(.Frame1.left + .Frame1.Width +
4, .Frame1.Top, .tlBanner.Width - (.Frame1.Width + 8), .ClientHeight -
(.tlBanner.Height + (.btback.Height * 3.5)))
.btback.Move(.pnlWinHost.Left, .Frame1.top + .Frame1.Height
- .btback.Height, MdlObjSizer.get_object_width(.btback.text) + 36)
.btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width
+ 8), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)
' for the quit button, it'll get a little tricky
Modified: branches/iVL/FrmHostPrep.class
==============================================================================
--- branches/iVL/FrmHostPrep.class (original)
+++ branches/iVL/FrmHostPrep.class Wed Jul 23 14:59:48 2008
@@ -20,14 +20,20 @@
PUBLIC SUB Form_Open()
FMain.FrmCurr = ME
-FMain.tvPlan["Prep3"].Picture = MdlCore.sDonePic
+FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
FMain.tvPlan["Inst0"].picture = MdlCore.sNowPic
FMain.tvPlan["Inst0"].Selected = TRUE
' may need to move this code to another event. The FormOpen event
only happens once.
- ME.PREPARE_ALL_PARTITIONS()
+ 'ME.PREPARE_ALL_PARTITIONS()
+ WAIT
+ FrmInstallSys.Reparent(ME.Parent)
+ ME.Hide
+ FrmInstallSys.Show
+' ME.Hide
+
END
Modified: branches/iVL/FrmHostPrep.form
==============================================================================
--- branches/iVL/FrmHostPrep.form (original)
+++ branches/iVL/FrmHostPrep.form Wed Jul 23 14:59:48 2008
@@ -4,7 +4,7 @@
MoveScaled(0,0,73,48)
Text = ("")
{ tlbanner TextLabel
- MoveScaled(1,3,59,3.375)
+ MoveScaled(1,1,59,3.375)
Text = ("Vectorlinux is preparing your system for installation.
Please wait.")
}
{ frmStatus Frame
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Wed Jul 23 14:59:48 2008
@@ -30,18 +30,21 @@
' 2: Write /etc/fstab
' 3: Install packages
- sRes = MdlInstallSys.MOUNT_DEFINED_PARTITIONS()
- IF sRes AND sRes <> 0 THEN
- RETURN ' exit... there was an error mounting
- END IF
+ ' CAN'T TEST THIS UNTIL I GET A GOOD TESTING ENVIRONMENT
+ ' ' ' ' ' ' ' ' ' sRes = MdlInstallSys.MOUNT_DEFINED_PARTITIONS()
+ ' ' ' ' ' ' ' ' ' IF sRes AND sRes <> 0 THEN
+ ' ' ' ' ' ' ' ' ' RETURN ' exit... there was an error mounting
+ ' ' ' ' ' ' ' ' ' END IF
sRes = 0
sRes = MdlInstallSys.WRITE_NEW_FSTAB()
IF sRes AND sRes <> 0 THEN
- RETURN
+ Message("Error writing fstab")
+ RETURN
END IF
sRes = 0
sRes = MdlInstallSys.INSTALL_BULK_PACKAGES()
IF sRes AND sRes <> 0 THEN
+ Message("Error installing bulk packages")
RETURN
END IF
sRes = 0
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Wed Jul 23 14:59:48 2008
@@ -4,7 +4,7 @@
MoveScaled(0,0,78,51)
Text = ("")
{ tlBanner TextLabel
- MoveScaled(6,1,63,3)
+ MoveScaled(1,1,63,3)
Text = ("Vectorlinux is currently being installed to your
system... Please wait")
}
{ FrmProg Frame
Modified: branches/iVL/FrmPartScheme.form
==============================================================================
--- branches/iVL/FrmPartScheme.form (original)
+++ branches/iVL/FrmPartScheme.form Wed Jul 23 14:59:48 2008
@@ -4,19 +4,19 @@
MoveScaled(0,0,81,50)
Text = ("")
{ tlBanner TextLabel
- MoveScaled(1,2,51,4)
+ MoveScaled(1,1,51,4)
Text = ("Select your disk partition option")
}
{ rbUseExisting RadioButton
- MoveScaled(2,7,32,3.3333)
+ MoveScaled(1,6,32,3.25)
Text = ("Use existing disk partitions")
}
{ rbEditPartitions RadioButton
- MoveScaled(2,12,62,3.3333)
+ MoveScaled(1,10,62,3.25)
Text = ("Modify my disk partitions to make room for new installation")
}
{ tlChoiceExp TextLabel
- MoveScaled(1,20,76,23)
+ MoveScaled(1,16,76,23)
Text = ("TextLabel1")
}
}
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Wed Jul 23 14:59:48 2008
@@ -34,7 +34,8 @@
PUBLIC SUB Form_Resize()
WITH ME
- .tlBanner.Width = .ClientWidth - 8
+ '.tlBanner.Width = .ClientWidth - 8
+ .tlBanner.Move(4, 4, .ClientWidth - 8, 27)
.rbFull.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height + 8,
MdlObjSizer.get_object_width(.rbfull.text) + 36)
.rbCustom.Move(.tlBanner.Left, .rbFull.top + .rbFull.Height + 4,
MdlObjSizer.get_object_width(.rbcustom.text) + 36)
.tlActionDesc.Width = .tlBanner.Width - 4
Modified: branches/iVL/FrmPkgSel.form
==============================================================================
--- branches/iVL/FrmPkgSel.form (original)
+++ branches/iVL/FrmPkgSel.form Wed Jul 23 14:59:48 2008
@@ -4,23 +4,23 @@
MoveScaled(0,0,64,64)
Text = ("")
{ tlBanner TextLabel
- MoveScaled(1,2,55,5)
+ MoveScaled(1,1,55,5)
Text = ("TextLabel1")
Alignment = Align.Normal
}
{ rbFull RadioButton
- MoveScaled(1,8,40,3)
+ MoveScaled(1,7,40,3.375)
Text = ("Full Install")
}
{ rbCustom RadioButton
- MoveScaled(1,11,55,3)
+ MoveScaled(1,12,55,3.375)
Text = ("Custom Install")
}
{ tlActionDesc TextLabel
- MoveScaled(1,15,63,6)
+ MoveScaled(1,17,63,6)
Text = ("")
}
{ scrlInstallOpts ScrollView
- MoveScaled(1,22,52,28)
+ MoveScaled(1,24,52,28)
}
}
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Wed Jul 23 14:59:48 2008
@@ -31,17 +31,25 @@
FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
FMain.tvPlan["Inst0"].Picture = MdlCore.sNowPic
FMain.btback.Enabled = TRUE
-FMain.btback.ForeColor = Color.Black
+' FMain.btback.ForeColor = Color.Black
END
PUBLIC SUB Form_Resize()
WITH ME
- .tlBanner.Width = .ClientWidth - 4
- .scrSumm.Move(.tlBanner.left, .tlBanner.top + .tlBanner.Height +
4, .tlBanner.Width - 32, .ClientHeight - .tlBanner.Height * 2)
- .tlSummary.Move(4, 4)
+ .tlBanner.Move(4, 4, .ClientWidth - 8)
+ '.scrSumm.Move(4, .tlBanner.top + (.tlBanner.Height +
8), .tlBanner.Width - (.tlBanner.Width / 2), .ClientH
- .tlBanner.Height * 1.5)
+ '.tlBanner.Width = .ClientWidth - 8
+ '.scrSumm.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height +
8, .tlBanner.Width - 300, .ClientHeight - .tlBanner.Height * 1.5)
+ .scrSumm.Move(.tlBanner.left, .tlBanner.top + .tlBanner.Height +
4, .tlBanner.Width - 4, .ClientHeight - .tlBanner.Height * 2)
+ '.scrSumm.Move(4, .tlBanner.top + .tlBanner.Height + 4)
+ '.scrSumm.Resize(.ClientWidth - 16, .tlBanner.top
+ .tlBanner.Height + 4)
+ .tlSummary.Move(2, 4)
'.tlSummary.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height
+ 4, .tlBanner.Width, .ClientH - 16)
+
+
+
END WITH
Modified: branches/iVL/FrmSummary.form
==============================================================================
--- branches/iVL/FrmSummary.form (original)
+++ branches/iVL/FrmSummary.form Wed Jul 23 14:59:48 2008
@@ -3,17 +3,16 @@
{ Form Form
MoveScaled(0,0,64,64)
Text = ("")
- Arrangement = Arrange.Vertical
{ tlBanner TextLabel
MoveScaled(1,1,27,10)
Text = ("TextLabel1")
- Alignment = Align.Left
+ Alignment = Align.TopLeft
}
{ scrSumm ScrollView
- MoveScaled(1,12,61,43)
- Arrangement = Arrange.Vertical
+ MoveScaled(0,12,61,43)
{ tlSummary TextLabel
- MoveScaled(1,2,55,85)
+ MoveScaled(2,1,55,85)
+ Expand = True
Text = ("TextLabel1")
}
}
Modified: branches/iVL/FrmWinDrives.form
==============================================================================
--- branches/iVL/FrmWinDrives.form (original)
+++ branches/iVL/FrmWinDrives.form Wed Jul 23 14:59:48 2008
@@ -8,7 +8,7 @@
Expand = True
}
{ tlBanner TextLabel
- MoveScaled(1,2,65,5)
+ MoveScaled(1,1,65,5)
Text = ("Select the windows partitions you would like to mount
during boot")
}
}
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Wed Jul 23 14:59:48 2008
@@ -15,12 +15,17 @@
' You should have received a copy of the GNU General Public License
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
-PUBLIC FUNCTION MOUNT_DEFINED_PARTITIONS() AS Integer
+ PRIVATE hproc AS Process
+ PRIVATE sDump AS String
+ PRIVATE sErr AS String
+
+PUBLIC FUNCTION MOUNT_DEFINED_PARTITIONS() AS Integer
-
+
' this is where we need to set the mount target
- ClsGlobal.sTargetMnt = "/mnt/target"
+ 'ClsGlobal.sTargetMnt = "/mnt/target"
+ ClsGlobal.sTargetMnt = "/home/moises/mnt/target" ' just for testing now.
IF Exist(ClsGlobal.sTargetMnt) = FALSE THEN
TRY MKDIR ClsGlobal.sTargetMnt
END IF
@@ -29,12 +34,13 @@
SHELL "umount " & ClsGlobal.sTargetMnt WAIT 'clear the mount point
- SHELL "mount " & ClsPartSel.sRoot & Space(1) &
ClsGlobal.sTargetMnt & Space(1) & " -t " & ClsPartSel.fRoot WAIT 'moun
the root partition first
- IF ClsPartSel.sHome THEN
- SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "home" WAIT
- SHELL "mount " & ClsPartSel.sHome & Space(1) &
ClsGlobal.sTargetMnt &/ "home -t " & ClsPartSel.fhome WAIT 'mount the
home partition if defined
+ '/DISABLED FOR TESTING INSTALL ONLY
+ ' ' ' ' SHELL "mount " & ClsPartSel.sRoot & Space(1) &
ClsGlobal.sTargetMnt & Space(1) & " -t " & ClsPartSel.fRoot WAIT 'moun
the root partition first
+ ' ' ' ' IF ClsPartSel.sHome THEN
+ ' ' ' ' SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "home" WAIT
+ ' ' ' ' SHELL "mount " & ClsPartSel.sHome & Space(1) &
ClsGlobal.sTargetMnt &/ "home -t " & ClsPartSel.fhome WAIT 'mount the
home partition if defined
- END IF
+ ' ' ' ' END IF
IF ClsPartSel.sUsr THEN
SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "usr" WAIT
SHELL "mount " & ClsPartSel.sUsr & Space(1) &
ClsGlobal.sTargetMnt &/ "usr -t" & ClsPartSel.fUsr WAIT ' mount the
user partition
@@ -59,7 +65,7 @@
'WRITE THE NEW FSTAB NOW, RIGHT BEFORE INSTALLING PACKAGES.
- 'ME.WRITE_NEW_FSTAB() ' do this from the install form
+ ME.WRITE_NEW_FSTAB() ' do this from the install form
@@ -160,12 +166,25 @@
sFstab = sFstab & gb.NewLine &
ClsPartSel.sSwap & Space(5) & "none" & Space(5) & "swap" & Space(5)
& "sw" & Space(5) & "0" & Space(5) & "0"
END IF
+
+sFstab = sFstab & "\n"
' Wheewww!... that's the whole fstab there... Please fix the win partitions
+ 'Message(sFstab)
+
+ IF NOT ClsGlobal.sTargetMnt OR ClsGlobal.sTargetMnt = "" THEN
+ ClsGlobal.sTargetMnt = "/home/moises/mnt/target"
+ END IF
+
+ ';Message(ClsGlobal.sTargetMnt &/ "etc")
' now save the file to /etc/fstab
+ IF Exist(ClsGlobal.sTargetMnt &/ "etc") = FALSE THEN
+ MKDIR ClsGlobal.sTargetMnt &/ "etc"
+ END IF
TRY File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "fstab", SConv(sFstab))
CATCH
- RETURN 1
+ PRINT ERROR
+ '.RETURN 1
END
@@ -192,15 +211,117 @@
END
PUBLIC FUNCTION INSTALL_BULK_PACKAGES() AS Integer
+ DIM i AS Integer
+ DIM sShell AS String
+ DIM sPKG AS String
+ DIM sDump AS String
+ DIM sBulkList AS String
+ DIM sType AS String
+ DIM sList AS String[]
+ DIM sBulk AS String
+ DIM sBulkPath AS String = ClsGlobal.sSourceMnt &/ "veclinux" &/ "required"
+
+ SHELL "ls -m " & sBulkPath TO sBulkList
+ sList = Split(sBulkList, ",")
+ FOR i = 0 TO sList.Count - 1
+ sBulk = Trim(sList[i])
+ sType = File.Ext(sBulkPath &/ sBulk)
+ ' SELECT CASE sType
+ ' CASE "tlz", "lzm", "lzma"
+ sShell = "lzmadec " & sBulkPath &/ sBulk & " | tar
-xp -C " & ClsGlobal.sTargetMnt
+ 'Message(sBulkPath &/ sBulk & " | tar -xp -C " & ClsGlobal.sTargetMnt)
+' END SELECT
+ 'Message(sShell)
+ 'Message(ClsGlobal.sSourceMnt &/ "veclinux" &/ "required"
&/ sBulk)
+
+ 'Message("type = " & sType & " command = " & sShell)
+ hproc = SHELL sShell FOR READ
+ WAIT
+ IF hproc.State = Process.Running THEN
+ REPEAT
+ WAIT
+ PRINT "Installing " & sBulk
+ UNTIL
+ hproc.State = Process.Stopped
+ END IF
+ NEXT
+
+
+ ' ' '
+ ' ' '
+ ' ' ' IF ClsPkgSel.bCustom = TRUE THEN
+ ' ' ' ' need to get the list of packages selected by user
+ ' ' ' ELSE
+ ' ' ' ' do the optional bulks first
+ ' ' '
+ ' ' ' 'FOR EACH sPKG IN RDir(ClsGlobal.sSourceMnt
&/ "veclinux" &/ "optional")
+ ' ' ' SELECT CASE File.Ext(sPkg)
+ ' ' ' CASE "tlz", "lzm", "lzma"
+ ' ' ' sShell = "lzmadec < " & ClsGlobal.sSourceMnt
&/ "veclinux" &/ "optional" &/ sPkg & " | tar -xp -C " & ClsGlobal.sTargetMnt
+ ' ' '
+ ' ' ' CASE "bz2", "tbz2", "tbz"
+ ' ' ' sShell = "tar -xpjf " & ClsGlobal.sSourceMnt
&/ "veclinux" &/ "optional" &/ sPkg & " -C " & ClsGlobal.sTargetMnt
+ ' ' ' END SELECT
+ ' ' '
+ ' ' ' 'FrmInstallSys.tlCurrPkg.Text = "Installing " & sPkg
+ ' ' '
+ ' ' ' 'hproc = SHELL sShell
+ ' ' ' Message(sShell)
+ ' ' ' RETURN 1
+ ' ' ' ME.INSTALL_TO_HOST(sShell)
+ ' ' '
+ ' ' ' ' ' WAIT
+ ' ' ' ' ' IF hproc.State = Process.Running THEN
+ ' ' ' ' ' REPEAT
+ ' ' ' ' ' ' IF hproc.State = Process.Running THEN
+ ' ' ' ' ' FrmInstallSys.pbInstallProg.Value =
FrmInstallSys.pbInstallProg.Value + 0.00001
+ ' ' ' ' ' WAIT
+ ' ' ' ' ' ' END IF
+ ' ' ' ' ' UNTIL hproc.State = Process.Stopped
+ ' ' ' ' ' 'END IF
+ ' ' ' ' '
+ ' ' ' ' ' sDump = Trim(sDump)
+ ' ' ' ' ' sErr = Trim(sErr)
+ ' ' ' ' ' IF serr <> "" THEN
+ ' ' ' ' ' Message("There has been an error
installing " & sPkg & gb.NewLine & "<b>Error:</b>" & gb.NewLine & serr)
+ ' ' ' ' ' RETURN 1
+ ' ' ' ' ' END IF
+ ' ' ' ' ' 'Message(sPkg & " is installed")
+ ' ' ' ' ' END IF
+ ' ' ' NEXT
+ ' ' ' 'RETURN
+ ' ' '
+ ' ' ' END IF
+ ' ' '
+END
+
+
+
+PUBLIC FUNCTION INSTALL_PACKAGES() AS Integer
END
-PUBLIC FUNCTION INSTALL_PACKAGES() AS Integer
+PUBLIC FUNCTION INSTALL_TO_HOST(sCmnd AS String) AS Integer
+
+ hproc = SHELL sCmnd FOR READ
+
+
+END
+
+PUBLIC SUB Process_read()
+ DIM sLine AS String
+ READ #LAST, sLine, -256
+ sDump = sDump & gb.NewLine & sLine
+ PRINT sLine
END
+PUBLIC SUB process_error(msg AS String)
+ sErr = sErr & gb.NewLine & sErr
+ PRINT MSG
+END
\ No newline at end of file
Added: branches/iVL/images/installer-steel.png
==============================================================================
Binary file. No diff available.
Modified: branches/iVL/images/installer.png
==============================================================================
Binary files. No diff available.
|
