diff options
| author | tdro <tdro@users.noreply.github.com> | 2019-12-21 18:59:35 -0500 |
|---|---|---|
| committer | tdro <tdro@users.noreply.github.com> | 2019-12-21 18:59:35 -0500 |
| commit | 0798a74cb5a1380ac0007d7fdcfc83ffeb816d11 (patch) | |
| tree | d0ff5494cc0ddb9b577ec6398ebe81ee0491f254 /.config/fzf-marks | |
| parent | 815592d49d95cabe029a83138c3781bf1bc8226c (diff) | |
| download | dotfiles-0798a74cb5a1380ac0007d7fdcfc83ffeb816d11.tar.gz dotfiles-0798a74cb5a1380ac0007d7fdcfc83ffeb816d11.tar.bz2 dotfiles-0798a74cb5a1380ac0007d7fdcfc83ffeb816d11.zip | |
.config/fzf-marks: Add interactive shell check back
Diffstat (limited to '.config/fzf-marks')
| -rw-r--r-- | .config/fzf-marks/fzf-marks.plugin.bash | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/.config/fzf-marks/fzf-marks.plugin.bash b/.config/fzf-marks/fzf-marks.plugin.bash index d9791d5..4927753 100644 --- a/.config/fzf-marks/fzf-marks.plugin.bash +++ b/.config/fzf-marks/fzf-marks.plugin.bash @@ -20,8 +20,16 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +FZF_MARKS_COMMAND='fzf --height 40%' +FZF_MARKS_FILE=$HOME/.config/fzf-marks/.fzf-marks + command -v fzf >/dev/null 2>&1 || return +function is_interactive_shell() { + # https://www.gnu.org/software/bash/manual/html_node/Is-this-Shell-Interactive_003f.html + [[ "$-" =~ "i" ]] +} + if [[ -z "${FZF_MARKS_FILE}" ]] ; then FZF_MARKS_FILE="${HOME}/.fzf-marks" fi @@ -116,7 +124,11 @@ function jump { if [[ -n ${jumpline} ]]; then jumpdir=$(echo "${jumpline}" | sed 's/.*: \(.*\)$/\1/' | sed "s#~#${HOME}#") bookmarks=$(_handle_symlinks) + if is_interactive_shell; then cd "${jumpdir}" || return + else + echo "${jumpdir}" || return + fi if ! [[ "${FZF_MARKS_KEEP_ORDER}" == 1 ]]; then perl -n -i -e "print unless /^\\Q${jumpline//\//\\/}\\E\$/" "${bookmarks}" echo "${jumpline}" >> "${FZF_MARKS_FILE}" @@ -145,7 +157,9 @@ function dmark { fi } +if is_interactive_shell; then bind "\"${FZF_MARKS_JUMP:-\C-g}\":\"fzm\\n\"" +fi if [ "${FZF_MARKS_DMARK}" ]; then bind "\"${FZF_MARKS_DMARK}\":\"dmark\\n\"" fi |