[Vectorlinux-devel] [vinstall-ng commit] r71 - branches/iVL

[<cod...@go...>]

Author: M0...@gm...
Date: Thu Jul 24 15:04:10 2008
New Revision: 71

Modified:
   branches/iVL/MdlInstallSys.module
   branches/iVL/Order

Log:
Bulks are now installing, but progressbar value is not being figured 
out correctly. FIX NOW

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Thu Jul 24 15:04:10 2008
@@ -247,29 +247,36 @@
                 sPakDesc = sEntry[2]
              'PRINT sBasePath &/ sPakPath & " = " & sPakDesc & " 
size= " & CStr(sPakSize)
                       ' figure out the sizing and the progrss meter
+                      iTotalSize = 0
+                      sTargetSize = 0
+
                          SHELL "export gsize=$(df| grep /dev/hda3) && 
echo $gsize | cut -f3 -d \' \'" TO sTargetSize
                           'Message(CStr(sTargetSize))
                           iTotalSize = CInt(sTargetSize) + CInt(sPakSize)

+
                         'RETURN
                  PRINT "Installing " & sPakPath & " Total size (KB) = " 
& CStr(sPakSize)
+                FrmInstallSys.tlCurrPkg.Text = "Installing " & 
sPakDesc & " ... "
                hproc = SHELL "lzmadec <" & sBasePath &/ sPakPath & " | 
tar -xp -C " & ClsGlobal.sTargetMnt
                 WAIT 1
                   IF hproc.State = Process.Running THEN
                     REPEAT
-                      WAIT
+                      WAIT 3
                           ' get the actual size at each snap
                              SHELL "export tsize=$(df | grep /dev/hda3) 
&& echo $tsize | cut -f3 -d \' \'" TO iCurrSize
                             iCurrSize = Trim(CStr(iCurrSize))
-                            iVal = CInt(iTotalSize) / CInt(iCurrSize)
+                            'iVal = Round(CInt(iCurrSize) / 
CInt(iTotalSize), -2) 'CInt(iTotalSize) / CInt(iCurrSize)
+                            iVal = Round((iTotalSize - iCurrSize) / 
iTotalSize, -2)
                              'FrmInstallSys.pbInstallProg.Value = 
(CInt(iCurrSize) / CInt(iTotalSize)) * 0.100
                              'PRINT CStr(iCurrSize) & "/" & 
CStr(iTotalSize) & " = " & iVal & "%"
-                            PRINT CStr(iTotalSize) & "/" & 
CStr(iCurrSize) & " = " & iVal & "%"
+                            PRINT CStr(iTotalSize) & "/" & 
CStr(iCurrSize) & " = " & iVal
+                            FrmInstallSys.pbInstallProg.Value = iVal

                     UNTIL
                       hproc.State = Process.Stopped
                   END IF
-                PRINT sPak & " is installed... "
+                PRINT sPakDesc & " is installed... "
            'PRINT "Needs to install " & sPak
           END IF
     NEXT

Modified: branches/iVL/Order
==============================================================================
--- branches/iVL/Order	(original)
+++ branches/iVL/Order	Thu Jul 24 15:04:10 2008
@@ -4,4 +4,18 @@
 (09:55:32 AM) uelsk8s: 4 $mntpint/packages/required
 (09:55:32 AM) uelsk8s: 5 $MNTPNT/veclinux/required/vlconfig2.tlz
  (09:55:57 AM) uelsk8s: because they are not listed in packages.txt for 
the user to select from
-(09:56:13 AM) uelsk8s: they have to be installed or the install will break
\ No newline at end of file
+(09:56:13 AM) uelsk8s: they have to be installed or the install will break
+
+
+10:38:40 AM) uelsk8s: :)
+(10:39:45 AM) uelsk8s: mbused() {
+(10:39:46 AM) uelsk8s:   MB=0
+(10:39:46 AM) uelsk8s:   for DEV in $DEVICES ; do
+(10:39:46 AM) uelsk8s:     line=`df | grep $DEV`
+(10:39:46 AM) uelsk8s:     if [ "$line" ]; then
+(10:39:46 AM) uelsk8s:       mb1=`echo $line | cut -f 3 -d ' '`
+(10:39:48 AM) uelsk8s:       MB=`expr $MB '+' $mb1`
+(10:39:50 AM) uelsk8s:     fi
+(10:39:52 AM) uelsk8s:   done;
+(10:39:54 AM) uelsk8s:   echo $MB
+(10:39:56 AM) uelsk8s: }
\ No newline at end of file