Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make sure script doesn't execute if fzf is an alias and the command doesn't actually exist #66

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Make sure script doesn't execute if fzf is an alias and the command doesn't actually exist #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8f72db
improve checking existance of fzf command (ignore aliases)
3ximus Sep 20, 2024
de2df93
Update fzf-marks.plugin.zsh
3ximus Sep 22, 2024
c9e1859
add 'command' to all fzf invocations to prevent picking up aliases
3ximus Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions fzf-marks.plugin.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

command -v fzf >/dev/null 2>&1 || return
type -P fzf >/dev/null || return

if [[ -z ${FZF_MARKS_FILE-} ]] ; then
FZF_MARKS_FILE=$HOME/.fzf-marks
Expand All @@ -32,15 +32,15 @@ fi

if [[ -z ${FZF_MARKS_COMMAND-} ]] ; then

_fzm_FZF_VERSION=$(fzf --version | awk -F. '{ print $1 * 1e6 + $2 * 1e3 + $3 }')
_fzm_FZF_VERSION=$(command fzf --version | awk -F. '{ print $1 * 1e6 + $2 * 1e3 + $3 }')
_fzm_MINIMUM_VERSION=16001

if [[ $_fzm_FZF_VERSION -gt $_fzm_MINIMUM_VERSION ]]; then
FZF_MARKS_COMMAND="fzf --height 40% --reverse"
FZF_MARKS_COMMAND="command fzf --height 40% --reverse"
elif [[ ${FZF_TMUX:-1} -eq 1 ]]; then
FZF_MARKS_COMMAND="fzf-tmux -d${FZF_TMUX_HEIGHT:-40%}"
FZF_MARKS_COMMAND="command fzf-tmux -d${FZF_TMUX_HEIGHT:-40%}"
else
FZF_MARKS_COMMAND="fzf"
FZF_MARKS_COMMAND="command fzf"
fi
fi

Expand Down
10 changes: 5 additions & 5 deletions fzf-marks.plugin.zsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

command -v fzf >/dev/null 2>&1 || return
type -p fzf >/dev/null || return

if [[ -z ${FZF_MARKS_FILE-} ]] ; then
FZF_MARKS_FILE=$HOME/.fzf-marks
Expand All @@ -30,15 +30,15 @@ fi

if [[ -z ${FZF_MARKS_COMMAND-} ]] ; then

_fzm_FZF_VERSION=$(fzf --version | awk -F. '{ print $1 * 1e6 + $2 * 1e3 + $3 }')
_fzm_FZF_VERSION=$(command fzf --version | awk -F. '{ print $1 * 1e6 + $2 * 1e3 + $3 }')
_fzm_MINIMUM_VERSION=16001

if [[ $_fzm_FZF_VERSION -gt $_fzm_MINIMUM_VERSION ]]; then
FZF_MARKS_COMMAND="fzf --height 40% --reverse"
FZF_MARKS_COMMAND="command fzf --height 40% --reverse"
elif [[ ${FZF_TMUX:-1} -eq 1 ]]; then
FZF_MARKS_COMMAND="fzf-tmux -d${FZF_TMUX_HEIGHT:-40%}"
FZF_MARKS_COMMAND="command fzf-tmux -d${FZF_TMUX_HEIGHT:-40%}"
else
FZF_MARKS_COMMAND="fzf"
FZF_MARKS_COMMAND="command fzf"
fi
fi

Expand Down