Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r427 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-12-18 19:08:47
|
Author: M0...@gm...
Date: Thu Dec 18 11:08:02 2008
New Revision: 427
Modified:
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.project
branches/iVL/MdlInstallSys.module
branches/iVL/MdlLilo.module
branches/iVL/MdlPartFrmt.module
branches/iVL/MdlSetup.module
branches/iVL/installer.gambas
Log:
debugging installation process
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Dec 18 11:08:02 2008
@@ -14,27 +14,27 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlSetup.module:216
+#: MdlSetup.module:154
msgid "Calculating package count ... Please wait"
msgstr ""
-#: MdlSetup.module:272
+#: MdlSetup.module:210
msgid "Total bulks to be installed = "
msgstr ""
-#: MdlSetup.module:275
+#: MdlSetup.module:213
msgid "Total pkgs to be installed = "
msgstr ""
-#: MdlSetup.module:318
+#: MdlSetup.module:256
msgid "BROUGHT TO YOU BY"
msgstr ""
-#: MdlSetup.module:334
+#: MdlSetup.module:272
msgid "Activating swap space"
msgstr ""
-#: MdlSetup.module:336
+#: MdlSetup.module:274
msgid "Preparing filesystems"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Dec 18 11:08:02 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.14
+Version=0.1.20
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Dec 18 11:08:02 2008
@@ -552,106 +552,106 @@
END
-PUBLIC SUB PERFORM_FULL_INSTALL_OLD() AS Integer
-
- 'Will need to read SETUP.CONF to determine what to do here
-
- DIM sFile AS String[]
- DIM sEntry AS String[]
- DIM stlzList AS String[]
- DIM sTlz AS String
- DIM sPak AS String
- DIM sPakPath AS String
- DIM sPakSize AS Variant
- DIM sTargetSize AS Variant
- DIM iTotalSize AS Integer
- DIM iCurrSize AS Variant
- DIM sPakDesc AS String
- DIM i AS Integer
- DIM ii AS Integer
- DIM sLine AS String
- DIM sBulkPath AS String
- DIM sConfPath AS String
- DIM sOptPkgPath AS String
- DIM iVal AS Float
- DIM sBasePath AS String = ClsGlobal.sSourceMnt &/ "veclinux"
-
- WITH FrmInstallSys
- .Resize(FMain.pnlWinHost.Width, FMain.pnlWinHost.Height)
- END WITH
- ClsGlobal.iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
- 'Message.Info("Total packages = " & iPkgCnt)
- 'RETURN
- ' make sure the progress is revealed at the main window
- WITH FMain
- .tvPlan["Inst1"].Picture = MdlCore.sDonePic
- .tvPlan["Inst2"].Selected = TRUE
- .tvPlan["Inst2"].Picture = MdlCore.sNowPic
- END WITH
-
- MdlSetup.SHOW_PROGRESS_CONTROLS()
- FrmInstallSys.tlBanner.Text = ("Vectorlinux is now being installed.
Please wait...")
- ClsGlobal.sTargetMnt = "/mnt/target"
- 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)
- sPak = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
- sPak = Left(sPak, Len(sPak) - 1)
- sEntry = Split(sPak, ":")
- sPakPath = sEntry[0]
- sPakSize = sEntry[1]
- sPakDesc = sEntry[2]
- 'PRINT sBasePath &/ sPakPath & " = " & sPakDesc & "
size= " & CStr(sPakSize)
- ' figure out the sizing and the progrss meter
- 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)) '
-
- 'RETURN
- FrmInstallSys.tlCurrPkg.Text = "Installing " & sPakDesc
& " ..."
- FrmInstallSys.pbInstallProg.Value = 0.0
-
- PRINT "Installing " & sPakDesc & " Total size (KB) = " &
CStr(sPakSize)
- sDump = ""
- sErr = ""
- MdlCore.LOCK_GUI()
- 'inc iPkgNum
- hproc = SHELL "lzmadec <" & sBasePath &/ sPakPath & " | tar
-xp -C " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>
/tmp/installdump" 'FOR READ
-
- WAIT 2
- IF hproc.State = Process.Running THEN
- REPEAT
- WAIT 2
- UPDATE_STEP_PROGRESS(sTargetSize, sPakSize,
ClsGlobal.iPkgNum)
- UNTIL
- hproc.State = Process.Stopped
- ' error check
- sDump = File.Load("/tmp/installdump")
- IF InStr(sDump, "FAILED") > 0 THEN
- Message.Error(("There has been an error
extracting") & Space(1) & sPakDesc & gb.NewLine &
- "<b>ERROR</b>" & gb.NewLine &
- sErr)
- RETURN 1
- ELSE
- FrmInstallSys.pbInstallProg.Value = 1
- END IF
- PRINT sPak & " is installed... "
- INC ClsGlobal.iPkgNum
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
- END IF
- 'PRINT "Needs to install " & sPak
- END IF
- NEXT
- FrmInstallSys.tlBanner.Text = ("Finished intalling Bulks")
-
- ' now to the packages individually
- ' FrmInstallSys.tlBanner.Text = "Installing additional software."
- ' ME.INSTALL_PACKAGES
-END
+ ' PUBLIC SUB PERFORM_FULL_INSTALL_OLD() AS Integer
+ '
+ ' 'Will need to read SETUP.CONF to determine what to
do here
+ '
+ ' DIM sFile AS String[]
+ ' DIM sEntry AS String[]
+ ' DIM stlzList AS String[]
+ ' DIM sTlz AS String
+ ' DIM sPak AS String
+ ' DIM sPakPath AS String
+ ' DIM sPakSize AS Variant
+ ' DIM sTargetSize AS Variant
+ ' DIM iTotalSize AS Integer
+ ' DIM iCurrSize AS Variant
+ ' DIM sPakDesc AS String
+ ' DIM i AS Integer
+ ' DIM ii AS Integer
+ ' DIM sLine AS String
+ ' DIM sBulkPath AS String
+ ' DIM sConfPath AS String
+ ' DIM sOptPkgPath AS String
+ ' DIM iVal AS Float
+ ' DIM sBasePath AS String = ClsGlobal.sSourceMnt
&/ "veclinux"
+ '
+ ' WITH FrmInstallSys
+ ' .Resize(FMain.pnlWinHost.Width,
FMain.pnlWinHost.Height)
+ ' END WITH
+ ' ClsGlobal.iPkgCnt =
MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
+ ' 'Message.Info("Total packages = " & iPkgCnt)
+ ' 'RETURN
+ ' ' make sure the progress is revealed at the main
window
+ ' WITH FMain
+ ' .tvPlan["Inst1"].Picture = MdlCore.sDonePic
+ ' .tvPlan["Inst2"].Selected = TRUE
+ ' .tvPlan["Inst2"].Picture = MdlCore.sNowPic
+ ' END WITH
+ '
+ ' MdlSetup.SHOW_PROGRESS_CONTROLS()
+ ' FrmInstallSys.tlBanner.Text = ("Vectorlinux is now
being installed. Please wait...")
+ ' ClsGlobal.sTargetMnt = "/mnt/target"
+ ' 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)
+ ' sPak = Right(sLine, Len(sLine) -
InStr(sLine, "\'"))
+ ' sPak = Left(sPak, Len(sPak) - 1)
+ ' sEntry = Split(sPak, ":")
+ ' sPakPath = sEntry[0]
+ ' sPakSize = sEntry[1]
+ ' sPakDesc = sEntry[2]
+ ' 'PRINT sBasePath &/ sPakPath & "
= " & sPakDesc & " size= " & CStr(sPakSize)
+ ' ' figure out the sizing and
the progrss meter
+ ' 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)) '
+ '
+ ' 'RETURN
+ ' FrmInstallSys.tlCurrPkg.Text
= "Installing " & sPakDesc & " ..."
+ ' FrmInstallSys.pbInstallProg.Value =
0.0
+ '
+ ' PRINT "Installing " & sPakDesc & "
Total size (KB) = " & CStr(sPakSize)
+ ' sDump = ""
+ ' sErr = ""
+ ' MdlCore.LOCK_GUI()
+ ' 'inc iPkgNum
+ ' hproc = SHELL "lzmadec <" & sBasePath
&/ sPakPath & " | tar -xp -C " & ClsGlobal.sTargetMnt & " || echo
\'FAILED\' 2> /tmp/installdump" 'FOR READ
+ '
+ ' WAIT 2
+ ' IF hproc.State = Process.Running
THEN
+ ' REPEAT
+ ' WAIT 2
+ '
UPDATE_STEP_PROGRESS(sTargetSize, sPakSize, ClsGlobal.iPkgNum)
+ ' UNTIL
+ ' hproc.State = Process.Stopped
+ ' ' error check
+ ' sDump =
File.Load("/tmp/installdump")
+ ' IF
InStr(sDump, "FAILED") > 0 THEN
+ ' Message.Error(("There
has been an error extracting") & Space(1) & sPakDesc & gb.NewLine &
+ ' "<b>ERROR</b>" &
gb.NewLine &
+ ' sErr)
+ ' RETURN 1
+ ' ELSE
+ '
FrmInstallSys.pbInstallProg.Value = 1
+ ' END IF
+ ' PRINT sPak & " is installed... "
+ ' INC ClsGlobal.iPkgNum
+ '
FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
+ ' END IF
+ ' 'PRINT "Needs to install " & sPak
+ ' END IF
+ ' NEXT
+ ' FrmInstallSys.tlBanner.Text = ("Finished intalling
Bulks")
+ '
+ ' ' now to the packages individually
+ ' ' FrmInstallSys.tlBanner.Text = "Installing
additional software."
+ ' ' ME.INSTALL_PACKAGES
+ ' END
PUBLIC SUB UPDATE_STEP_PROGRESS(sTargetSize AS Float, sPakSize AS Float,
iCurrPkg AS Integer)
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Thu Dec 18 11:08:02 2008
@@ -38,7 +38,7 @@
IF Exist("/usr/bin/ms-sys") THEN
'dd if=/dev/hda of=/boot/MBR.$( date '+%m%d%y') bs=512 count=1
- SHELL "dd if=/dev/" & Trim(sTarget) & "
of=/mnt/target/boot/MBR.$( date +\'%m%d%y\') bs=512 count=1" WAIT
+ SHELL "dd if=/" & Trim(sTarget) & " of=/mnt/target/boot/MBR.$(
date +\'%m%d%y\') bs=512 count=1" WAIT
SHELL "/usr/bin/ms-sys -z " & Trim(sTarget) WAIT
ELSE
Modified: branches/iVL/MdlPartFrmt.module
==============================================================================
--- branches/iVL/MdlPartFrmt.module (original)
+++ branches/iVL/MdlPartFrmt.module Thu Dec 18 11:08:02 2008
@@ -38,7 +38,7 @@
PRINT "Partition formatting complete"
MdlCore.LOCK_GUI()
- MdlInstallSys.MOUNT_DEFINED_PARTITIONS() ' let the game begin
+ 'MdlInstallSys.MOUNT_DEFINED_PARTITIONS() ' let the game begin
' begin running the credits
' ' ' END IF
@@ -83,7 +83,7 @@
- PRINT "Formatting " & sAddr & " to " & sFS
+ 'PRINT "Formatting " & sAddr & " to " & sFS
hproc = SHELL sCommand & " || echo \'FAILED\'" WAIT 'for read
WAIT 2
IF hproc.State = Process.Running THEN
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Thu Dec 18 11:08:02 2008
@@ -89,68 +89,6 @@
END
-PUBLIC FUNCTION FORMAT_SELECTED_PARTITIONS() AS Integer
-
- 'DIM hproc AS Process
- DIM sDump AS String
-
-
-
-
- SHELL "mkfs." & LCase(ClsPartSel.fRoot) & " || echo \'ERROR\'" TO sDump
-
- GOTO CHECK_OUTPUT
-
-
- IF ClsPartSel.sHome AND ClsPartSel.fhome <> "Do not format" THEN
- sDump = ""
- SHELL "mkfs." & LCase(ClsPartSel.fhome) & " || echo \'ERROR\'" TO sDump
-
- GOTO CHECK_OUTPUT
- END IF
-
-
-
- IF ClsPartSel.sOpt AND ClsPartSel.fOpt <> "Do not format" THEN
- sDump = ""
- SHELL "mkfs." & LCase(ClsPartSel.fOpt) & " || echo \'ERROR\'" TO sDump
-
- GOTO CHECK_OUTPUT
- END IF
-
- IF ClsPartSel.sUsr AND ClsPartSel.fUsr <> "Do not format" THEN
- sDump = ""
- SHELL "mkfs." & LCase(ClsPartSel.fUsr) & " || echo \'ERROR\'" TO sDump
-
- GOTO CHECK_OUTPUT
- END IF
-
- IF ClsPartSel.sVar AND ClsPartSel.fVar <> "Do not format" THEN
- sDump = ""
- SHELL "mkfs." & LCase(ClsPartSel.fVar) & " || echo \'ERROR\'" TO sDump
-
- GOTO CHECK_OUTPUT
- END IF
-
- IF ClsPartSel.sTmp AND ClsPartSel.fTmp <> "Do not format" THEN
- sDump = ""
- SHELL "mkfs." & LCase(ClsPartSel.fTmp) & " || echo \'FAILED\'" TO
sDump
-
- GOTO CHECK_OUTPUT
- END IF
-
-
-
-CHECK_OUTPUT:
- IF InStr(sDump, "ERROR") = TRUE THEN
- RETURN 1 ' not good... stop right there
- ELSE
- RETURN 0
- END IF
-
-END
-
-
PUBLIC SUB SHOW_PROGRESS_CONTROLS()
@@ -334,7 +272,9 @@
FrmInstallSys.tlCurrPkg.text = ("Activating swap space")
MdlInstallSys.ACTIVATE_SWAP_SPACE()
FrmInstallSys.tlCurrPkg.text = ("Preparing filesystems")
+
MdlPartFrmt.PREPARE_ALL_PARTITIONS() ' This will start the install
process
+ MdlInstallSys.MOUNT_DEFINED_PARTITIONS()
END
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
