Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r90 - branches/iVL
|
From: <cod...@go...> - 2008-07-31 14:06:11
|
Author: uelsk8s
Date: Thu Jul 31 07:05:34 2008
New Revision: 90
Modified:
branches/iVL/MdlInstallSys.module
branches/iVL/MdlSetup.module
Log:
small code changes to fix errors on install system
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Jul 31 07:05:34 2008
@@ -28,9 +28,7 @@
' 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.
+ ClsGlobal.sTargetMnt = "/mnt/target"
IF Exist(ClsGlobal.sTargetMnt) = FALSE THEN
TRY MKDIR ClsGlobal.sTargetMnt
END IF
@@ -39,12 +37,12 @@
SHELL "umount " & ClsGlobal.sTargetMnt WAIT 'clear the mount point
'/DISABLED FOR TESTING INSTALL ONLY
- ' SHELL "mount " & ClsPartSel.sRoot & Space(1) &
ClsGlobal.sTargetMnt 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 " & LCase(ClsPartSel.fhome)
WAIT 'mount the home partition if defined
- '
- ' END IF
+ SHELL "mount " & ClsPartSel.sRoot & Space(1) &
ClsGlobal.sTargetMnt 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 " & LCase(ClsPartSel.fhome)
WAIT 'mount the home partition if defined
+
+ 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
@@ -203,19 +201,19 @@
'PRINT ERROR
'.RETURN 1
'RETURN 0
- IF ClsPkgSel.bCustom = TRUE THEN
- ' perform custom install
- MdlInstallCustom.PERFORM_CUSTOM_INSTALL()
- ELSE
- FrmInstallSys.tlCurrPkg.Text = "Vectorlinux is now
installing ... Please wait"
- ME.PERFORM_FULL_INSTALL()
+ ' IF ClsPkgSel.bCustom = TRUE THEN
+ ' ' perform custom install
+ ' MdlInstallCustom.PERFORM_CUSTOM_INSTALL()
+ ' ELSE
+ ' FrmInstallSys.tlCurrPkg.Text = "Vectorlinux is now
installing ... Please wait"
+ ' ME.PERFORM_FULL_INSTALL()
'ME.INSTALL_CONFIG_PACKAGES
're-direct to packages for now
'FrmInstallSys.tlCurrPkg.Text = "Installing Additional
software... Please wait"
'ME.INSTALL_REQUIRED_PACKAGES()
'ME.INSTALL_PACKAGES()
- END IF
+ ' END IF
END
PUBLIC FUNCTION fS_oPTIONS(sType AS String) AS String
@@ -245,8 +243,9 @@
DIM iret AS Integer
- ClsGlobal.sTargetMnt = "/home/moises/mnt/target"
-
+ ClsGlobal.sTargetMnt = "/mnt/target"
+ iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
+ Message.Info("Total packages = " & iPkgCnt)
WITH FMain
.tvPlan["Inst2"].Selected = TRUE
.tvPlan["Inst2"].Picture = MdlCore.sNowPic
@@ -294,7 +293,7 @@
' WRITE THE FSTAB NOW
MdlInstallSys.WRITE_NEW_FSTAB()
- Message.Info("Vectorlinux is now installed in your system. REboot
may be necessary")
+ Message.Info("Vectorlinux is now installed in your system. Please
Exit the installer")
@@ -320,13 +319,15 @@
arrFile = Split(sFile, "\n")
FOR i = 0 TO arrFile.Count - 1
sLine = Trim(arrFile[i])
- IF Left(sLine, Len("PACKAGE_NAME")) = "PACKAGE_NAME" THEN
+ 'WAIT 10
+ IF Left(sLine, Len("PACKAGE_NAME")) = "PACKAGE NAME" THEN
sPkgName = Trim(Right(sLine, Len(sLine) - InStr(sLine, ":")))
'sPkgPath = Right(arrFile[
- sPkgPath = Right(arrFile[i + 1], Len(arrFile[i + 1]) -
InStr(arrFile[i + 1], ":"))
- vPgsSize = Trim(Right(arrFile[i + 3], Len(arrFile[i +
3]) - InStr(arrFile[i + 3], ":")) - 1)
+ sPkgPath = Right(Right(arrFile[i + 1], Len(arrFile[i +
1]) - InStr(arrFile[i + 1], ":")), -4)
+ vPgsSize = Left(Right(arrFile[i + 3], Len(arrFile[i +
3]) - InStr(arrFile[i + 3], ":")), -2)
' now install the package
SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot
& " ) && echo $gsize | cut -f3 -d \' \'" TO vTargetSize
+ PRINT "installing " & ClsGlobal.sSourceMnt
&/ "packages" &/ sPkgPath &/ sPkgName
ME.PACKAGE_INSTALL(ClsGlobal.sSourceMnt
&/ "packages" &/ sPkgPath &/ sPkgName)
WAIT
IF hproc.State = Process.Running THEN
@@ -357,6 +358,7 @@
PUBLIC FUNCTION INSTALL_BULK_PACKAGES() AS Integer
DIM sRawList AS String
DIM sList AS String[]
+ DIM sCount AS String[]
DIM sTrimmed AS String
DIM sLineArr AS String[]
DIM sBulkPath AS String
@@ -364,16 +366,20 @@
DIM sBulkDesc AS String
DIM vTargetSize AS Variant
DIM i AS Integer
- DIM sFile AS String = File.Load(ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF")
+ 'DIM sFile AS String = File.Load(ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF")
DIM sLine AS String
+ PRINT "inside INSTALL_BULK_PACKAGES"
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^BULK" TO sRawList
+ ' sList = Split(File.Load(Temp$("SETUP.CONF")), "\n")
-
- ' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^BULK" TO sRawList
- sList = Split(sFile, "\n")
+ sList = Split(sRawList, "\n")
+ PRINT sRawList & "srawlist " & sList.Count
FOR i = 0 TO sList.count - 1
- sLine = Trim(sList[i])
- IF Left(sLine, Len("BULKX")) = "BULK" & "*[0-9]*" THEN
+ 'SHELL ". /mnt/cdrom/veclinux/SETUP.CONF && echo $BULK"
& i TO sList[i]
+ 'sLine = Trim(sList[i])
+ PRINT sList[i]
+ IF Left(sList[i], Len("BULK")) = "BULK" THEN
sTrimmed = Right(sList[i], Len(sList[i]) - InStr(sList[i], "\'"))
sTrimmed = Left(sTrimmed, InStr(sTrimmed, "\'") - 1)
@@ -381,10 +387,13 @@
sBulkPath = sLineArr[0]
vBulkSize = sLineArr[1]
sBulkDesc = sLineArr[2]
+ PRINT sBulkPath & vBulkSize & sBulkDesc
SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " )
&& echo $gsize | cut -f3 -d \' \'" TO vTargetSize
-
- 'ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulkPath)
+ PRINT "installing " & sBulkPath
+ ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulkPath)
+ hproc = SHELL "lzmadec <" & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sBulkPath & " | tar -xp -C " & ClsGlobal.sTargetMnt
& " || echo \'FAILED\'" FOR READ
+ PRINT sBulkPath
WAIT 1
IF hproc.State = Process.Running THEN
REPEAT
@@ -393,7 +402,7 @@
UNTIL
hproc.State = Process.Stopped
'error check
- END IF
+ END IF
END IF
NEXT
'RETURN
@@ -457,7 +466,7 @@
.Resize(FMain.pnlWinHost.Width, FMain.pnlWinHost.Height)
END WITH
iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
- 'Message.Info("Total packages = " & iPkgCnt)
+ Message.Info("Total packages = " & iPkgCnt)
'RETURN
' make sure the progress is revealed at the main window
WITH FMain
@@ -531,8 +540,8 @@
FrmInstallSys.tlBanner.Text = "Finished intalling Bulks"
' now to the packages individually
- FrmInstallSys.tlBanner.Text = "Installing additional software."
- ME.INSTALL_PACKAGES
+ ' FrmInstallSys.tlBanner.Text = "Installing additional software."
+ ' ME.INSTALL_PACKAGES
END
@@ -679,7 +688,7 @@
iCurrTlz = i
'hproc = SHELL "install-pkg " & sTlzPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
- ME.PACKAGE_INSTALL(sTlzBasePath &/ sTlzPath)
+ ME.PACKAGE_INSTALL(sTlzPath)
WAIT 1
IF hproc.State = Process.Running THEN
REPEAT
@@ -715,36 +724,37 @@
PRINT "Installing final system configuration"
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF"
& " | grep ^CONF" TO sRawList
'Message.Info(sRawList)
- IF InStr(sRawList, "\n") THEN
- PRINT "Multiple config files found ... starting at the top
of the list"
-
- sList = Split(sRawList, "\n")
- FOR i = 0 TO sList.count - 1
- sCOnfLine = Trim(sList[i])
- IF Left(sCOnfLine, Len("CONF")) = "CONF" THEN
- sPkg = Right(sCOnfLine, Len(sCOnfLine) - InStr(sCOnfLine, "\'"))
- 'PRINT sPkg
- sLinarr = Split(sPkg, ":")
- sPkgPath = sLinarr[0]
-
- 'PRINT sPkgPath
- ' now install the packages
- INC iPkgNum
- ' This may need to be installed as a bulk
rather than a package
- 'hproc = SHELL "install-pkg " & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sPkgPath & Space(1) & ClsGlobal.sTargetMnt & " || echo
\'FAILED\'" FOR READ
- ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sPkgPath)
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
- WAIT 1
- IF hproc.State = Process.Running THEN
- REPEAT
- WAIT 2
- UNTIL
- hproc.State = Process.Stopped
-' INC iPkgNum
- END IF
- END IF
- NEXT
- ELSE ' only one line found
+ PRINT sRawList & " config"
+' IF InStr(sRawList, "\n") THEN
+' PRINT "Multiple config files found ... starting at the top
of the list"
+'
+' sList = Split(sRawList, "\n")
+' FOR i = 0 TO sList.count - 1
+' sCOnfLine = Trim(sList[i])
+' IF Left(sCOnfLine, Len("CONF")) = "CONF" THEN
+' sPkg = Right(sCOnfLine, Len(sCOnfLine) - InStr(sCOnfLine, "\'"))
+' 'PRINT sPkg
+' sLinarr = Split(sPkg, ":")
+' sPkgPath = sLinarr[0]
+'
+' 'PRINT sPkgPath
+' ' now install the packages
+' INC iPkgNum
+' ' This may need to be installed as a bulk
rather than a package
+' 'hproc = SHELL "install-pkg " & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sPkgPath & Space(1) & ClsGlobal.sTargetMnt & " || echo
\'FAILED\'" FOR READ
+' ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux"
&/ sPkgPath)
+' FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+' WAIT 1
+' IF hproc.State = Process.Running THEN
+' REPEAT
+' WAIT 2
+' UNTIL
+' hproc.State = Process.Stopped
+' ' INC iPkgNum
+' END IF
+' END IF
+' NEXT
+' ELSE ' only one line found
PRINT "Found a single CONF package... Installing it now"
sRawList = Trim(sRawList)
sLinarr = Split(sRawList, ":")
@@ -752,7 +762,7 @@
' now install the package
INC iPkgNum
'hproc = SHELL "install-pkg " & sPkgPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
- ME.BULK_INSTALL(sPkgPath)
+ ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sPkgPath)
FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
WAIT 1
IF hproc.State = Process.Running THEN
@@ -762,7 +772,7 @@
hproc.State = Process.Stopped
' INC iPkgNum
END IF
- END IF
+ ' END IF
IF InStr(sDump, "FAILED") > 0 THEN
RETURN 1
ELSE
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Thu Jul 31 07:05:34 2008
@@ -146,8 +146,11 @@
END
PUBLIC FUNCTION UPDATE_OVERALL_PROGRESS(iTotalPkgs AS Integer,
iCurrPkg AS Integer) AS Float
-
DIM fRet AS Float
+ ' IF iTotalPkgs = 0 THEN
+ ' iTotalPkgs = 10
+ ' ENDIF
+
fRet = iCurrPkg / iTotalPkgs
fRet = Round(fRet, -2)
RETURN fRet
@@ -166,31 +169,31 @@
' let's get a package count
IF bCustom = FALSE THEN ' DOING A FULL INSTALL
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF
| grep ^BULK" TO sDump
- sDump = Trim(sDump)
- sTotalList = sTotalList & sDump
- sTotalList = Trim(sTotalList)
- sDump = ""
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF
| grep ^CONF" TO sDump
- sTotalList = sTotalList & gb.NewLine & Trim(sDump)
- sDump = ""
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT | grep ^\"PACKAGE NAME\"" TO sDump
- sTotalList = sTotalList & gb.NewLine & Trim(sDump)
- sDump = ""
- SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sDump
- sTotalList = sTotalList & gb.NewLine & Trim(sDump)
- sDump = ""
- ' split the array
- sList = Split(sTotalList, "\n")
- FOR i = 0 TO sList.Count - 1
- IF sList[i] = "" THEN
- sList.Delete(i)
- END IF
- NEXT
- iQTY = sList.Count
-
+ ' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux"
&/ "SETUP.CONF | grep ^BULK" TO sDump
+ ' sDump = Trim(sDump)
+ ' sTotalList = sTotalList & sDump
+ ' sTotalList = Trim(sTotalList)
+ ' sDump = ""
+ ' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux"
&/ "SETUP.CONF | grep ^CONF" TO sDump
+ ' sTotalList = sTotalList & gb.NewLine & Trim(sDump)
+ ' sDump = ""
+ ' SHELL "cat " & ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT | grep ^\"PACKAGE NAME\"" TO sDump
+ ' sTotalList = sTotalList & gb.NewLine & Trim(sDump)
+ ' sDump = ""
+ ' SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sDump
+ ' sTotalList = sTotalList & gb.NewLine & Trim(sDump)
+ ' sDump = ""
+ ' ' split the array
+ ' sList = Split(sTotalList, "\n")
+ ' FOR i = 0 TO sList.Count - 1
+ ' IF sList[i] = "" THEN
+ ' sList.Delete(i)
+ ' END IF
+ ' NEXT
+ ' iQTY = sList.Count
+ SHELL "find /mnt/cdrom -name *.tlz|wc -l" TO iQTY
ELSE ' GOING FOR CUSTOM INSTALL
-
+
END IF
|
