From 5cfba96ca932266c7b50c9e432f13dd858e031db Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 17 May 2011 20:46:36 -0700
Subject: etc-update: clear term when appropriate

This solves an issue like bug #142508, but involving etc-update instead
of dispatch-conf. This is also relevant to bug #70668, which is the
same issue, though the reporter suggested to use colors to delimit the
output instead of using clear.
---
 bin/etc-update | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'bin/etc-update')

diff --git a/bin/etc-update b/bin/etc-update
index 03e9dc9fe..73a1f5d1a 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -149,6 +149,7 @@ sel_file() {
 		elif [ "${DELETE_ALL}" == "yes" ]; then
 			input=0
 		else
+			clear
 			if [[ ${mode} == 0 ]] ; then
 				echo "The following is the list of files which need updating, each
 configuration file is followed by a list of possible replacement files."
@@ -316,6 +317,7 @@ do_cfg() {
 		elif [[ "${DELETE_ALL}" == "yes" ]] && ! user_special "${ofile}"; then
 			my_input=2
 		else
+			clear
 			if [ "${using_editor}" == 0 ]; then
 				(
 					echo "Showing differences between ${ofile} and ${file}"
@@ -418,7 +420,9 @@ Please select from the menu above (-1 to exit, losing this merge): "
 				   rm ${rm_opts} "${file}"
 				   return 255
 				   ;;
-				2)	if [ "${using_editor}" == 0 ]; then
+				2)
+					clear
+					if [ "${using_editor}" == 0 ]; then
 						(
 							echo "Showing differences between ${ofile} and ${mfile}"
 							diff_command "${ofile}" "${mfile}"
-- 
cgit v1.2.3-1-g7c22