From d528f63c8873f1d523c7e41a08a513d6be3b6d4d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Th=C3=A9r=C3=A8se=20Godefroy?= Date: Sun, 24 Sep 2017 21:21:18 +0200 Subject: [PATCH] en/kitchen: color-wdiff.1 uses reformat-html.1. --- en/kitchen/{color-wdiff => color-wdiff.1} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename en/kitchen/{color-wdiff => color-wdiff.1} (91%) diff --git a/en/kitchen/color-wdiff b/en/kitchen/color-wdiff.1 similarity index 91% rename from en/kitchen/color-wdiff rename to en/kitchen/color-wdiff.1 index 9d84eeec..86dbdc21 100755 --- a/en/kitchen/color-wdiff +++ b/en/kitchen/color-wdiff.1 @@ -35,12 +35,12 @@ arg=($1 $2) set -e close_term () { - printf '\n%s' '*** Close the terminal window or press Return.'; read OK - test -z "$OK" && exit $1 + sleep 3 + exit $1 } -f[0]=$(mktemp -t cdif.XXXXXX) || close_or_exit 1 -f[1]=$(mktemp -t cdif.XXXXXX) || close_or_exit 1 +f[0]=$(mktemp -t cdif.XXXXXX) || exit 1 +f[1]=$(mktemp -t cdif.XXXXXX) || exit 1 trap 'rm -f "${f[0]}" "${f[1]}"' EXIT ## Prepare the pages to be compared. @@ -62,8 +62,8 @@ for n in 0 1; do if test "${input%.html}" != "$input" -a "${input%-diff.html}" == "$input"; then # - Standardize the format for easier reading of the diff. - if test -f "$HOME/bin/reformat-html"; then - $HOME/bin/reformat-html $input ${f[$n]} + if test -f "$HOME/bin/reformat-html.1"; then + $HOME/bin/reformat-html.1 $input ${f[$n]} else cp $input ${f[$n]} fi -- 2.25.1