From 05c189cfa4902de3d47ebef91cc8d91109ff461e Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Wed, 24 Jul 2019 10:42:12 +0200 Subject: [PATCH] Fix merge errors --- .config/shell/rc.d/fuzzy-finding.sh | 4 ++-- .local/share/qutebrowser/userscripts/wallabag_add.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.config/shell/rc.d/fuzzy-finding.sh b/.config/shell/rc.d/fuzzy-finding.sh index 888beca..988f5b5 100644 --- a/.config/shell/rc.d/fuzzy-finding.sh +++ b/.config/shell/rc.d/fuzzy-finding.sh @@ -27,8 +27,8 @@ else fi # set up fuzzy file and directory search -alias f="fzf -c 'find . -type f' --preview='"'head -$LINES {}'"' | xargs xdg-open" -alias F="fzf -c 'find ~ -type f' --preview='"'head -$LINES {}'"' | xargs xdg-open" +alias f="fzf -c 'find . -type f' --preview='"'head -$LINES {}'"' | xargs -0 xdg-open" +alias F="fzf -c 'find ~ -type f' --preview='"'head -$LINES {}'"' | xargs -0 xdg-open" alias d="fzf -c 'find . -type d' --preview='ls --color='always' {}' | cd" alias D="fzf -c 'find ~ -type d' --preview='ls --color='always' {}' --color=dark --ansi | cd" diff --git a/.local/share/qutebrowser/userscripts/wallabag_add.sh b/.local/share/qutebrowser/userscripts/wallabag_add.sh index 2b6cb33..7b04ff3 100755 --- a/.local/share/qutebrowser/userscripts/wallabag_add.sh +++ b/.local/share/qutebrowser/userscripts/wallabag_add.sh @@ -4,4 +4,4 @@ # https://github.com/swalladge/dotfiles/blob/master/local/share/qutebrowser/userscripts/wallabag_add.sh # v2.* -echo "open https://read.martyoeh.me/bookmarklet?url=$QUTE_URL" >> "$QUTE_FIFO" +echo "open https://read.martyoeh.me/bookmarklet?url=$QUTE_URL" >>"$QUTE_FIFO"