diff --git a/ldiff b/ldiff new file mode 100755 index 0000000..4b6e868 --- /dev/null +++ b/ldiff @@ -0,0 +1,33 @@ +#!/bin/bash +# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 +source "$(dirname "$0")/lib/ulib/auto" || exit 1 + +function display_help() { + uecho "$scriptname: frontend de diff pour comparer deux fichiers encodés en latin1 + +USAGE + $scriptname [options] Lfile Rfile + +OPTIONS + -u, -U, --unified N + -w, --ignore-all-space + -B, --ignore-blank-lines + options de diff qui sont reprises telles quelles" +} + +diffopts=() +args=( + --help '$exit_with display_help' + -u '$diffopts+=(-u)' + -U:,--unified: '$diffopts+=(-U "$value_")' + -w,--ignore-all-space '$diffopts+=(-w)' + -B,--ignore-blank-lines '$diffopts+=(-B)' +) +parse_args "$@"; set -- "${args[@]}" + +Lfile="$1" +Rfile="$2" +[ -n "$Lfile" -a -n "$Rfile" ] || die "vous devez spécifier les deux fichiers" +[ -d "$Lfile" -o -d "$Rfile" ] && die "il faut absolument comparer deux fichiers" + +diff "${diffopts[@]}" <(iconv -f latin1 -t utf-8 "$Lfile") <(iconv -f latin1 -t utf-8 "$Rfile") diff --git a/lless b/lless index 5ea1cfb..1c03313 100755 --- a/lless +++ b/lless @@ -14,7 +14,7 @@ OPTIONS -R, --RAW-CONTROL-CHARS -e, --quit-at-eof -E, --QUIT-AT-EOF - options de less qui sont reportées telles quelles" + options de less qui sont reprises telles quelles" } lessopts=()