diff options
| author | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-12-07 22:00:03 +0000 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-12-07 22:04:19 +0000 |
| commit | 434fad09b1248f961fa089b405276a4011e8cbc0 (patch) | |
| tree | 6b397528771e8f1a894dc1ef62c8787b22933365 /community/fzf/find-buzybox-compat.patch | |
| parent | d5062a9afb8b740cb2cba859e70c9b44e19e6755 (diff) | |
| download | aports-434fad09b1248f961fa089b405276a4011e8cbc0.tar.bz2 aports-434fad09b1248f961fa089b405276a4011e8cbc0.tar.xz | |
community/fzf: fix buzybox find incompattibility
fzf uses `-fstype` for find commands, but buzybox find does not support
that. Remove those as they just exclude things like `/proc/`, which
mainly causes issues when running `fzf` from `/`.
Fixes #11022
Diffstat (limited to 'community/fzf/find-buzybox-compat.patch')
| -rw-r--r-- | community/fzf/find-buzybox-compat.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/community/fzf/find-buzybox-compat.patch b/community/fzf/find-buzybox-compat.patch new file mode 100644 index 0000000000..9ccc999c14 --- /dev/null +++ b/community/fzf/find-buzybox-compat.patch @@ -0,0 +1,52 @@ +diff --git a/shell/key-bindings.bash b/shell/key-bindings.bash +index 2ecf685..a553f12 100644 +--- a/shell/key-bindings.bash ++++ b/shell/key-bindings.bash +@@ -1,7 +1,7 @@ + # Key bindings + # ------------ + __fzf_select__() { +- local cmd="${FZF_CTRL_T_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \ ++ local cmd="${FZF_CTRL_T_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' \\) -prune \ + -o -type f -print \ + -o -type d -print \ + -o -type l -print 2> /dev/null | cut -b3-"}" +diff --git a/shell/key-bindings.fish b/shell/key-bindings.fish +index 035ba55..42fb55b 100644 +--- a/shell/key-bindings.fish ++++ b/shell/key-bindings.fish +@@ -11,7 +11,7 @@ function fzf_key_bindings + # "-path \$dir'*/\\.*'" matches hidden files/folders inside $dir but not + # $dir itself, even if hidden. + set -q FZF_CTRL_T_COMMAND; or set -l FZF_CTRL_T_COMMAND " +- command find -L \$dir -mindepth 1 \\( -path \$dir'*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' \\) -prune \ ++ command find -L \$dir -mindepth 1 \\( -path \$dir'*/\\.*' \\) -prune \ + -o -type f -print \ + -o -type d -print \ + -o -type l -print 2> /dev/null | sed 's@^\./@@'" +diff --git a/shell/key-bindings.zsh b/shell/key-bindings.zsh +index a77d136..70f0e41 100644 +--- a/shell/key-bindings.zsh ++++ b/shell/key-bindings.zsh +@@ -4,7 +4,7 @@ if [[ $- == *i* ]]; then + + # CTRL-T - Paste the selected file path(s) into the command line + __fsel() { +- local cmd="${FZF_CTRL_T_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \ ++ local cmd="${FZF_CTRL_T_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' \\) -prune \ + -o -type f -print \ + -o -type d -print \ + -o -type l -print 2> /dev/null | cut -b3-"}" +diff --git a/src/constants.go b/src/constants.go +index e32c092..b356f06 100644 +--- a/src/constants.go ++++ b/src/constants.go +@@ -59,7 +59,7 @@ var defaultCommand string + + func init() { + if !util.IsWindows() { +- defaultCommand = `set -o pipefail; command find -L . -mindepth 1 \( -path '*/\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \) -prune -o -type f -print -o -type l -print 2> /dev/null | cut -b3-` ++ defaultCommand = `set -o pipefail; command find -L . -mindepth 1 \( -path '*/\.*' \) -prune -o -type f -print -o -type l -print 2> /dev/null | cut -b3-` + } else if os.Getenv("TERM") == "cygwin" { + defaultCommand = `sh -c "command find -L . -mindepth 1 -path '*/\.*' -prune -o -type f -print -o -type l -print 2> /dev/null | cut -b3-"` + } else { |