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.

diff --git a/bin/etc-update b/bin/etc-update
index 03e9dc9fe7454dd9ea94a56b619a2d969bcba77a..73a1f5d1ae6906fbedfe6151d22e8eb68448e9c9 100755 (executable)
--- 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}"