[gentoo-commits] portage r11673 - main/trunk/bin

[Mike Frysinger (vapier)]

Author: vapier
Date: 2008-10-10 22:02:15 +0000 (Fri, 10 Oct 2008)
New Revision: 11673

Modified:
   main/trunk/bin/etc-update
Log:
only use dummy echos in do_file() when running in interactive mode

Modified: main/trunk/bin/etc-update
===================================================================
--- main/trunk/bin/etc-update	2008-10-10 20:33:08 UTC (rev 11672)
+++ main/trunk/bin/etc-update	2008-10-10 22:02:15 UTC (rev 11673)
@@ -227,7 +227,8 @@
 }
 
 do_file() {
-	echo
+	interactive_echo() { [ "${OVERWRITE_ALL}" != "yes" ] && [ "${DELETE_ALL}" != "yes" ] && echo; }
+	interactive_echo
 	local -i my_input
 	local -i fcount=0
 	until (( $(wc -l < ${TMP}/files/${input}) < 2 )); do
@@ -296,7 +297,7 @@
 			break
 		fi
 	done
-	echo
+	interactive_echo
 	rm ${TMP}/files/${input}
 	count=${count}-1
 }