r2627 - in dists/trunk/live-helper: docs functions

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-29 09:46:45 +0000 (Sun, 29 Jul 2007)
New Revision: 2627

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/functions/stagefile.sh
Log:


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-07-29 07:57:14 UTC (rev 2626)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-07-29 09:46:45 UTC (rev 2627)
@@ -1,3 +1,8 @@
+2007-07-29  Daniel Baumann  <daniel at debian.org>
+
+	* functions/stagefile.sh:
+	  - Added missing NAME.
+
 2007-07-28  Daniel Baumann  <daniel at debian.org>
 
 	* functions/chroot.sh:

Modified: dists/trunk/live-helper/functions/stagefile.sh
===================================================================
--- dists/trunk/live-helper/functions/stagefile.sh	2007-07-29 07:57:14 UTC (rev 2626)
+++ dists/trunk/live-helper/functions/stagefile.sh	2007-07-29 09:46:45 UTC (rev 2627)
@@ -44,6 +44,7 @@
 
 Require_stagefile ()
 {
+	NAME="`basename ${0}`"
 	FILES="${@}"
 	NUMBER="`echo ${@} | wc -w`"
 
@@ -59,11 +60,11 @@
 
 	if [ "${CONTINUE}" != "true" ]
 	then
-		if [ "${NUMBER}" -gt 1 ]
+		if [ "${NUMBER}" -eq 1 ]
 		then
+			Echo_error "${NAME} missing"
+		else
 			Echo_error "one of ${NAME} is missing"
-		else
-			Echo_error "${NAME} missing"
 		fi
 
 		exit 1