[Lunar-commits] r14664 - in lunar-iso/trunk: isolinux lunar-install/sbin

[Auke Kok]

Author: sofar
Date: 2005-05-08 14:38:40 +0000 (Sun, 08 May 2005)
New Revision: 14664

Modified:
   lunar-iso/trunk/isolinux/f1.txt
   lunar-iso/trunk/isolinux/f2.txt
   lunar-iso/trunk/isolinux/f3.txt
   lunar-iso/trunk/lunar-install/sbin/lunar-install
Log:
2004->2005, and NUM should have been CNT.


Modified: lunar-iso/trunk/isolinux/f1.txt
===================================================================
--- lunar-iso/trunk/isolinux/f1.txt	2005-05-08 14:17:05 UTC (rev 14663)
+++ lunar-iso/trunk/isolinux/f1.txt	2005-05-08 14:38:40 UTC (rev 14664)
@@ -1,7 +1,7 @@
 
 Lunar-%VERSION%.iso, 0cLunar (%CODENAME%)07, kernel %KERNEL%
 
-0eWelcome07 to 05Lunar Linux07 Copyright (C) 2004 by the
+0eWelcome07 to 05Lunar Linux07 Copyright (C) 2005 by the
 09Lunar-Linux team <maintainer at lunar-linux.org>07
 All Rights Reserved.
 

Modified: lunar-iso/trunk/isolinux/f2.txt
===================================================================
--- lunar-iso/trunk/isolinux/f2.txt	2005-05-08 14:17:05 UTC (rev 14663)
+++ lunar-iso/trunk/isolinux/f2.txt	2005-05-08 14:38:40 UTC (rev 14664)
@@ -1,7 +1,7 @@
 
 Lunar-%VERSION%.iso, 0cLunar (%CODENAME%)07, kernel %KERNEL%
 
-0eWelcome07 to 05Lunar Linux07 Copyright (C) 2004 by the
+0eWelcome07 to 05Lunar Linux07 Copyright (C) 2005 by the
 09Lunar-Linux team <maintainer at lunar-linux.org>07
 All Rights Reserved.
 

Modified: lunar-iso/trunk/isolinux/f3.txt
===================================================================
--- lunar-iso/trunk/isolinux/f3.txt	2005-05-08 14:17:05 UTC (rev 14663)
+++ lunar-iso/trunk/isolinux/f3.txt	2005-05-08 14:38:40 UTC (rev 14664)
@@ -1,7 +1,7 @@
 
 Lunar-%VERSION%.iso, 0cLunar (%CODENAME%)07, kernel %KERNEL%
 
-0eWelcome07 to 05Lunar Linux07 Copyright (C) 2004 by the
+0eWelcome07 to 05Lunar Linux07 Copyright (C) 2005 by the
 09Lunar-Linux team <maintainer at lunar-linux.org>07
 All Rights Reserved.
 

Modified: lunar-iso/trunk/lunar-install/sbin/lunar-install
===================================================================
--- lunar-iso/trunk/lunar-install/sbin/lunar-install	2005-05-08 14:17:05 UTC (rev 14663)
+++ lunar-iso/trunk/lunar-install/sbin/lunar-install	2005-05-08 14:38:40 UTC (rev 14664)
@@ -565,7 +565,7 @@
             if [ -f /var/cache/lunar/aaa_base.tar.bz2 ]; then
 		echo XXX
 	        echo $(( CNT * 100 / NUM ))
-	        echo "\n$NUM: Installing aaa_base: base directories and files\n"
+	        echo "\n$CNT: Installing aaa_base: base directories and files\n"
 		echo XXX
 	        tar xjf /var/cache/lunar/aaa_base.tar.bz2 2> /dev/null
 	        (( CNT++ ))
@@ -573,7 +573,7 @@
 	    if [ -f /var/cache/lunar/aaa_dev.tar.bz2 ]; then
 	        echo XXX
 	        echo $(( CNT * 100 / NUM ))
-		echo "\n$NUM: Installing aaa_dev: device nodes\n"
+		echo "\n$CNT: Installing aaa_dev: device nodes\n"
 		echo XXX
 		tar xjf /var/cache/lunar/aaa_dev.tar.bz2 2> /dev/null
 	        (( CNT++ ))
@@ -584,7 +584,7 @@
 	        SIZ=$(echo $LINE | cut -d: -f5)
 		echo XXX
 	        echo $(( CNT * 100 / NUM ))
-	        echo "\n$NUM: Installing $MOD-$VER ($SIZ)\n\n($(basename /var/cache/lunar/$MOD-$VER-*.tar.bz2))\n"
+	        echo "\n$CNT: Installing $MOD-$VER ($SIZ)\n\n($(basename /var/cache/lunar/$MOD-$VER-*.tar.bz2))\n"
 		echo XXX
 		transfer_package $MOD
 	        (( CNT++ ))
@@ -592,7 +592,7 @@
             if [ -f /var/lib/lunar/moonbase.tar.bz2 ] ; then
 		echo XXX
 	        echo $(( CNT * 100 / NUM ))
-                echo "\n$NUM: Installing moonbase"
+                echo "\n$CNT: Installing moonbase"
 		echo XXX
                   (
                     cd $TARGET/var/lib/lunar
@@ -604,7 +604,7 @@
 	    # transfer sources
 	        echo XXX
 		echo $(( CNT * 100 / NUM ))
-		echo "\n$NUM: Copying sources"
+		echo "\n$CNT: Copying sources"
 		echo "XXX"
 		cp /var/spool/lunar/* $TARGET/var/spool/lunar/
 	        (( CNT++ ))