[Lunar-commits] CVS: lunar-iso/lunar-install/sbin lunar-install, 1.7, 1.8

[Auke Kok]

Update of /var/cvs/lunar/lunar-iso/lunar-install/sbin
In directory espresso.foo-projects.org:/tmp/cvs-serv20956/lunar-install/sbin

Modified Files:
	lunar-install 
Log Message:
lunar fixdepends still fails somehow, but this should re-enable kernel building.


Index: lunar-install
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/lunar-install/sbin/lunar-install,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- lunar-install	23 Apr 2005 15:54:53 -0000	1.7
+++ lunar-install	23 Apr 2005 22:13:22 -0000	1.8
@@ -541,7 +541,7 @@
 
 	# calculate the total so we can display progress
         NUM=$(wc -l /.packages | awk '{print $1}')
-	(( NUM = NUM + 3 ))
+	(( NUM = NUM + 4 ))
         (
             if [ -f /var/cache/lunar/aaa_base.tar.bz2 ]; then
 		echo XXX
@@ -580,7 +580,16 @@
                     tar xjf /var/lib/lunar/moonbase.tar.bz2 2> /dev/null
 		    tar j --list -f /var/lib/lunar/moonbase.tar.bz2 | sed 's:^:/var/lib/lunar/:g' > $TARGET/var/log/lunar/install/moonbase-%VERSION%
                   )
+	        (( CNT++ ))
             fi
+	    # transfer sources
+	        echo XXX
+		echo $(( CNT * 100 / NUM ))
+		echo "\nCopying sources"
+		echo "XXX"
+		cp /var/spool/lunar/* $TARGET/var/spool/lunar/
+	        (( CNT++ ))
+	    # done
 	) | $DIALOG --title "Installing $NUM packages" --gauge "" 10 70 0 
 
         # setup list of installed packages etc.