[LON-CAPA-cvs] cvs: loncom /build lpml_parse.pl

[harris41]

harris41		Thu May 23 12:55:20 2002 EDT

  Modified files:              
    /loncom/build	lpml_parse.pl 
  Log:
  improving way in which 'echo -n' commands are called for configinstall
  mode
  
  
Index: loncom/build/lpml_parse.pl
diff -u loncom/build/lpml_parse.pl:1.48 loncom/build/lpml_parse.pl:1.49
--- loncom/build/lpml_parse.pl:1.48	Sun May 19 13:46:19 2002
+++ loncom/build/lpml_parse.pl	Thu May 23 12:55:20 2002
@@ -12,7 +12,7 @@
 # The LearningOnline Network with CAPA
 # lpml_parse.pl - Linux Packaging Markup Language parser
 #
-# $Id: lpml_parse.pl,v 1.48 2002/05/19 17:46:19 harris41 Exp $
+# $Id: lpml_parse.pl,v 1.49 2002/05/23 16:55:20 harris41 Exp $
 #
 # Written by Scott Harrison, codeharrison@yahoo.com
 #
@@ -1283,9 +1283,9 @@
 		' && echo "**** NOTE: CONFIGURATION FILE CHANGE ****"'.
 		" \\\n\t\t".$logcmd.' && '." \\\n\t\t"."echo -n \"".
 		'You likely need to compare contents of "'."\\\n\t\t\t".
-		'echo -n "'.$targetroot.'/'.$target.'"'."\\\n\t\t".
-		'echo -n "with the new "'."\\\n\t\t\t".
-                'echo "'.$targetroot.'/'.$target.'.lpmlnew"'."\\\n\t\t".
+		'&& echo -n "'.$targetroot.'/'.$target.'"'."\\\n\t\t".
+		'&& echo -n " with the new "'."\\\n\t\t\t".
+                '&& echo "'.$targetroot.'/'.$target.'.lpmlnew"'."\\\n\t\t".
 		"$logcmd); } && "." \\\n\t"."\\\n\t"."\\\n\t".
 
 
@@ -1296,13 +1296,13 @@
 		$targetroot.'/'.$target."\\\n\t\t".
 		' && echo "**** WARNING: NEW CONFIGURATION FILE ADDED ****"'.
 		"\\\n\t\t".$logcmd.' && '."\\\n\t\t".
-		'echo -n "'.
+		'&& echo -n "'.
 		'You likely need to review the contents of "'."\\\n\t\t\t".
-		'echo -n "'.
+		'&& echo -n "'.
 		$targetroot.'/'.$target.'"'."\\\n\t\t\t".
-		'echo -n "'.
-		'to make sure its "'."\\\n\t\t".
-		'echo "'.
+		'&& echo -n "'.
+		' to make sure its "'."\\\n\t\t".
+		'&& echo "'.
                 'settings are compatible with your overall system"'."\\\n\t\t".
 		"$logcmd); } && "."\\\n\t"."\\\n\t"."\\\n\t".