From b61c4f1cbccbb0dbf771e2f3204fa57ab9caad1b Mon Sep 17 00:00:00 2001 From: Mahmoud Al-Qudsi Date: Thu, 5 Oct 2017 13:40:32 +0200 Subject: [PATCH] Correct `string replace` usage in pip2/3 completions \b does not match "end of spaces" but rather "start of a-z/0-9" and so does not match the start of string '-c'. Match (and then re-insert) a literal ' ' as part of the pattern instead. --- share/completions/pip2.fish | 2 +- share/completions/pip3.fish | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/completions/pip2.fish b/share/completions/pip2.fish index 8cc6457eb..af3ef5630 100644 --- a/share/completions/pip2.fish +++ b/share/completions/pip2.fish @@ -3,5 +3,5 @@ if command -sq pip2 # See discussion at https://github.com/fish-shell/fish-shell/pull/4448 # and pip bug at https://github.com/pypa/pip/pull/4755 # Keep this even after pip fix is upstreamed for users not on the latest pip - pip2 completion --fish | string replace -r "\b-c\s+pip\b" -- "-c pip2" | source + pip2 completion --fish | string replace -r -- " -c\s+pip\b" " -c pip2" | source end diff --git a/share/completions/pip3.fish b/share/completions/pip3.fish index 1d1da95e8..1542a5528 100644 --- a/share/completions/pip3.fish +++ b/share/completions/pip3.fish @@ -3,5 +3,5 @@ if command -sq pip3 # See discussion at https://github.com/fish-shell/fish-shell/pull/4448 # and pip bug at https://github.com/pypa/pip/pull/4755 # Keep this even after pip fix is upstreamed for users not on the latest pip - pip3 completion --fish | string replace -r "\b-c\s+pip\b" -- "-c pip3" | source + pip3 completion --fish | string replace -r -- " -c\s+pip\b" " -c pip3" | source end