diff options
| author | Mike Vink <ivi@vinkies.net> | 2025-07-21 21:43:57 +0200 |
|---|---|---|
| committer | Mike Vink <ivi@vinkies.net> | 2025-07-21 21:43:57 +0200 |
| commit | 48a2f738af58da4efdd1b1037fd88c1903e12a06 (patch) | |
| tree | 2a3c7f3110628b8d03b8487e681cae4ef92044af | |
| parent | ace76ed6ff7c70d1251839f090dd286212b4f10e (diff) | |
make diff script more ok
| -rw-r--r-- | .config/kak/autoload/diff.kak | 8 | ||||
| -rw-r--r-- | .config/shell/profile | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.config/kak/autoload/diff.kak b/.config/kak/autoload/diff.kak index 8f916f0..257990b 100644 --- a/.config/kak/autoload/diff.kak +++ b/.config/kak/autoload/diff.kak @@ -11,7 +11,7 @@ diff-selections %{ result="$dir/result.diff" printf "%s" "$1" > "$a" printf "%s" "$2" > "$b" - diff -uw "$a" "$b" > "$result" + diff -U10000 -w "$a" "$b" > "$result" [ "$3" ] && $3 "$result" printf %s\\n "evaluate-commands -try-client '$kak_opt_toolsclient' %{ edit -readonly ${result} @@ -62,9 +62,9 @@ diff-selections %{ put_original_files() { result="${1:?require result file}" - sed --in-place 's/^@@.*@@/'"$diff_lines"'/g' "${result}" >/dev/null - sed --in-place 's,^--- .*/a\s,--- '"$file_name_a"' ,g' "${result}" >/dev/null - sed --in-place 's,^+++ .*/b\s,+++ '"$file_name_b"' ,g' "${result}" >/dev/null + sed -i.bak 's/^@@.*@@/'"$diff_lines"'/g' "${result}" >/dev/null + sed -i.bak 's,^--- .*/a,--- '"$file_name_a"',g' "${result}" >/dev/null + sed -i.bak 's,^+++ .*/b,+++ '"$file_name_b"',g' "${result}" >/dev/null } diff_dance "$selection_content" "$1" put_original_files fi diff --git a/.config/shell/profile b/.config/shell/profile index 12c82aa..a6e8bd5 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -23,6 +23,7 @@ if [ "$(uname -s)" = "Darwin" ]; then export PATH="/usr/local/bin:$brewpath/bin:$PATH" export PATH="$brewpath/opt/findutils/libexec/gnubin:$PATH" export PATH="$brewpath/opt/util-linux/bin:$brewpath/opt/util-linux/sbin:$PATH" + export PATH="$brewpath/opt/curl/bin:$PATH" export PATH="$HOME/.local/bin/macos.d:$PATH" export SASL_PATH="$brewpath/opt/cyrus-sasl/lib/sasl2:$brewpath/opt/cyrus-sasl-xoauth2/lib/sasl2" fi |