From d549ae748626e648eeca7926569598f8d2653714 Mon Sep 17 00:00:00 2001 From: Krisan Alifari Date: Mon, 20 Apr 2020 23:49:35 +0700 Subject: Add nvim as a diff tool for getplugs plugin (#527) * Add nvim as a diff tool for getplugs plugin * Comment out `is_cmd_exists()` * Add nvim diff tool for diffs plugin * Add $EDITOR to nuke plugin for editing/reading text file format * Modify diff command to fix CircleCI failures * Fix getplugs prompt * Allow nuke to use custom $PAGER --- plugins/getplugs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'plugins/getplugs') diff --git a/plugins/getplugs b/plugins/getplugs index 169c4aa..5cda1ab 100755 --- a/plugins/getplugs +++ b/plugins/getplugs @@ -8,17 +8,21 @@ CONFIG_DIR=${XDG_CONFIG_HOME:-$HOME/.config}/nnn/ PLUGIN_DIR=${XDG_CONFIG_HOME:-$HOME/.config}/nnn/plugins -is_cmd_exists () { - which "$1" > /dev/null 2>&1 - echo $? -} +# is_cmd_exists () { +# which "$1" > /dev/null 2>&1 +# echo $? +# } merge () { - vimdiff +0 "$1" "$2" + if which nvim >/dev/null 2>&1; then + nvim -d "$1" "$2" + else + vimdiff +0 "$1" "$2" + fi } prompt () { - printf "%s" "Plugin $1 already exists and is different.\n" + printf "%s\n" "Plugin $1 already exists and is different." printf "Keep (k), merge (m), overwrite (o) [default: k]? " read -r operation -- cgit v1.2.3-70-g09d2