Unverified Commit 2d864d18 authored by a-n-n-a-l-e-e's avatar a-n-n-a-l-e-e Committed by GitHub
Browse files

Merge pull request #296261 from becknik/fix-fzf-git-sh2

fzf-git-sh: Fix substituting to many `git` occurrences
parents e283be86 01738bd3
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -39,12 +39,12 @@ stdenv.mkDerivation rec {
      -e "s,\buniq\b,${coreutils}/bin/uniq," \
      -e "s,\bcolumn\b,${util-linux}/bin/column," \
      -e "s,\bfzf-tmux\b,${fzf}/bin/fzf-tmux," \
      -e "/display-message/!s,\bgit\b,${git}/bin/git,g" \
      -e "s,\bgrep\b,${gnugrep}/bin/grep," \
      -e "s,\bsed\b,${gnused}/bin/sed," \
      -e "/fzf-tmux/!s,\btmux\b,${tmux}/bin/tmux," \
      -e "s,\bxargs\b,${findutils}/bin/xargs," \
      -e "s,\bxdg-open\b,${xdg-utils}/bin/xdg-open," \
      -e "/display-message\|fzf-git-\$o-widget\|\burl=\|\$remote_url =~ /!s,\bgit\b,${git}/bin/git,g" \
      -e "s,__fzf_git=.*BASH_SOURCE.*,__fzf_git=$out/share/${pname}/fzf-git.sh," \
      -e "/__fzf_git=.*readlink.*/d" \
      fzf-git.sh