| 1 |
God idea :) I'll apply. |
| 2 |
|
| 3 |
On Sat, 12/07/02 at 15:35:00 -0500, Timothy Robinson wrote: |
| 4 |
> etc-update has been dying on me after a diff. I'm sure the cause is |
| 5 |
> a character or two that the terminal doesn't like. Here is a patch |
| 6 |
> that I made that doesn't display the diff as soon as you select a file. |
| 7 |
> You can ask for the diff with option 4 still. |
| 8 |
> |
| 9 |
> Cheers, |
| 10 |
> Timothy Robinson |
| 11 |
|
| 12 |
> --- etc-update Sat Dec 7 15:26:39 2002 |
| 13 |
> +++ /usr/sbin/etc-update Sat Dec 7 15:28:21 2002 |
| 14 |
> @@ -179,11 +179,6 @@ |
| 15 |
> local -i my_input=0 |
| 16 |
> |
| 17 |
> until (( ${my_input} == -1 )) || [ ! -f ${file} ]; do |
| 18 |
> - ( echo "Showing differences between ${ofile} and ${file}" |
| 19 |
> - `echo "${diff_command}" | |
| 20 |
> - sed -e "s:%file1:${ofile}:" \ |
| 21 |
> - -e "s:%file2:${file}:"` ) |
| 22 |
> - # | ${pager} |
| 23 |
> echo -n "1) Replace original with update |
| 24 |
> 2) Delete update, keeping original as is |
| 25 |
> 3) Interactively merge original with update |
| 26 |
> @@ -204,7 +199,12 @@ |
| 27 |
> # [ ${my_input} == 255 ] && my_input=-1 |
| 28 |
> continue |
| 29 |
> ;; |
| 30 |
> - 4) continue |
| 31 |
> + 4) ( echo "Showing differences between ${ofile} and ${file}" |
| 32 |
> + `echo "${diff_command}" | |
| 33 |
> + sed -e "s:%file1:${ofile}:" \ |
| 34 |
> + -e "s:%file2:${file}:"` ) |
| 35 |
> + # | ${pager} |
| 36 |
> + continue |
| 37 |
> ;; |
| 38 |
> *) continue |
| 39 |
> ;; |
| 40 |
|
| 41 |
> -- |
| 42 |
> gentoo-dev@g.o mailing list |
| 43 |
|
| 44 |
-- |
| 45 |
gentoo-dev@g.o mailing list |
Archives