Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r271 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-11-07 22:01:20
|
Author: M0E.lnx
Date: Fri Nov 7 14:00:48 2008
New Revision: 271
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/DevLog
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/MdlInstallCustom.module
Log:
- Updated binary
Ready for testing
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Fri Nov 7 14:00:48 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.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Fri Nov 7 14:00:48 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/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Fri Nov 7 14:00:48 2008
@@ -1 +1,2 @@
-- Implemented new package listing for custom installation
+- Updated binary
+ Ready for testing
\ No newline at end of file
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Fri Nov 7 14:00:48 2008
@@ -141,7 +141,7 @@
'.tlCurrPkg.Move(4, 24, .FrmProg.Width - (.tlCurrPkg.Left * 2))
.tlCurrStepLbl.Move(4, .tlCurrPkg.top + .tlCurrPkg.Height + 4,
MdlObjSizer.get_object_width(.tlCurrStepLbl.text))
'.pbInstallProg.Move(.tlCurrStepLbl.Left + .tlCurrStepLbl.Width +
8, .tlCurrStepLbl.top, .FrmProg.w - (.pbInstallProg.x +
(.tlCurrStepLbl.left * 2)))
- .pbInstallProg.Move(.tlCurrStepLbl.left + .tlCurrStepLbl.Width + 4,
tlCurrStepLbl.top, .ClientWidth - (.pbInstallProg.Left -
4), .tlCurrStepLbl.Height) '.hrsep.Width - (pbInstallProg.Left))
+ .pbInstallProg.Move(.tlCurrStepLbl.left + .tlCurrStepLbl.Width + 4,
tlCurrStepLbl.top + (tlCurrStepLbl.Height / 4), .ClientWidth -
(.pbInstallProg.Left - 4), .tlCurrStepLbl.Height / 2) '.hrsep.Width -
(pbInstallProg.Left))
.tlCurrPkg2.Move(4, .pbInstallProg.top + .pbInstallProg.Height + 24,
MdlObjSizer.get_object_width(.tlCurrPkg2.text))
'.pbInstallProg2.Move(8, .tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .FrmProg.Width - (.pbInstallProg2.x * 2))
.pbInstallProg2.Move(4, tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .hrsep.Width)
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Fri Nov 7 14:00:48 2008
@@ -28,6 +28,7 @@
{ tlCurrStepLbl TextLabel
MoveScaled(3,26,11,3)
Text = ("Current Step ")
+ Alignment = Align.Normal
}
{ embCredits Panel
MoveScaled(12,40,52,32)
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Fri Nov 7 14:00:48 2008
@@ -282,25 +282,31 @@
'hproc = EXEC ["installpkg " & sBasePath &/ sLoc &/ sPkg & "
-R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump"]
'hproc = EXEC ["installpkg", sBasePath &/ sLoc &/
sPkg, "-R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>
/tmp/installdump"] WAIT
'hproc = EXEC ["installpkg " & sBasePath &/ sLoc &/ sPkg &
Space(1) & "-R" & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>
/tmp/installdump"] WAIT
- hproc = SHELL "installpkg " & sBasePath &/ sLoc &/ sPkg &
Space(1) & "-R" & Space(1) & ClsGlobal.sTargetMnt & Space(1) & "|| echo
\'FAILED\' 2> /tmp/installdump" 'WAIT
+ 'hproc = SHELL "installpkg " & sBasePath &/ sLoc &/ sPkg &
Space(1) & "-R" & Space(1) & ClsGlobal.sTargetMnt & Space(1) & "|| echo
\'FAILED\' 2> /tmp/installdump" 'WAIT
+ hproc = EXEC ["installpkg", "-R", ClsGlobal.sTargetMnt,
sBasePath &/ sLoc &/ sPkg] ' WAIT
+ 'if hpro
WAIT 1
IF hproc.State = Process.Running THEN
REPEAT
WAIT
UNTIL hproc.State = Process.Stopped
END IF
- sDump = File.Load("/tmp/installdump")
+ IF hproc.Value > 0 THEN
+ Message.Error(sPkg & Space(1) & ("Failed to install.
Installation will stop"))
+ RETURN 1
+ END IF
+' sDump = File.Load("/tmp/installdump")
'INC i
- IF InStr(sDump, "FAILED") > 0 THEN
- Message.Error("Error installing user-selected package" &
Space(1) & sPkg)
- RETURN 1
- ' ELSE
- ' RETURN 0
- END IF
-
+ ' ' IF InStr(sDump, "FAILED") > 0 THEN
+ ' ' Message.Error("Error installing user-selected
package" & Space(1) & sPkg)
+ ' ' RETURN 1
+ ' ' ' ELSE
+ ' ' ' RETURN 0
+ ' ' END IF
+ ' '
END IF
INC ii
UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count - 1
@@ -688,6 +694,8 @@
MdlSetup.SHOW_PROGRESS_CONTROLS()
FrmInstallSys.tlCurrPkg.Text = "Installing " & File.Name(sBulkPath)
hproc = SHELL "lzmadec <" & sBulkPath & " | tar -xp -C " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump" 'FOR READ
+ 'hproc = EXEC ["lzmadec", "<", sBulkPath, "|", "tar", "-xp", "-C",
clsglobal.sTargetMnt] 'WAIT
+ 'hproc = EXEC ["lzmadec", "<" & sBulkPath & " | tar -xp -C " &
ClsGlobal.sTargetMnt]
WAIT 1
IF hproc.State = Process.Running THEN
WAIT 1
@@ -699,18 +707,23 @@
IF vSize <> "" THEN
'MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vSize))
MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, vSize)
- 'FrmInstallSys.pbInstallProg2.Value =
FrmInstallSys.pbInstallProg2.Value + (fPbInc /
FrmInstallSys.pbInstallProg.Value) '(FrmInstallSys.pbInstallProg.Value /
fPbInc)
+
+ FrmInstallSys.pbInstallProg2.Value =
(FrmInstallSys.pbInstallProg2.Value + (fPbInc - (fPbInc *
FrmInstallSys.pbInstallProg.Value)) / 100)
END IF
UNTIL
hproc.State = Process.Stopped
- sDump = File.Load("/tmp/installdump")
- IF InStr(sDump, "FAILED") > 0 THEN
- RETURN 1
- ELSE
+ IF hproc.value > 0 THEN
+ Message.Error(File.BaseName(sBulkPath) & Space(1) & ("failed
to install. Installation will stop now"))
+ RETURN 1
+ END IF
+ ' ' ' sDump = File.Load("/tmp/installdump")
+ ' ' ' IF InStr(sDump, "FAILED") > 0 THEN
+ ' ' ' RETURN 1
+ ' ' ' ELSE
FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
RETURN 0
END IF
- END IF
+' END IF
END
|
