From 63288607376000d88583906f9ebd8036d6a3d613 Mon Sep 17 00:00:00 2001 From: Pavel Zhigulin Date: Wed, 19 Dec 2018 05:59:03 +0300 Subject: [PATCH 1/3] [issue#6161] Fix cargo commands list --- src/etc/cargo.bashcomp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/etc/cargo.bashcomp.sh b/src/etc/cargo.bashcomp.sh index 5bfdd20ba3b..ef5bbabd9f3 100644 --- a/src/etc/cargo.bashcomp.sh +++ b/src/etc/cargo.bashcomp.sh @@ -120,7 +120,7 @@ _cargo() } && complete -F _cargo cargo -__cargo_commands=$(cargo --list 2>/dev/null | tail -n +2) +__cargo_commands=$(cargo --list 2>/dev/null | tail -n +2 | sed -E -e "s/^\s+//g" | cut -d" " -f1) _locate_manifest(){ local manifest=`cargo locate-project 2>/dev/null` From bc9e3f6750a93cffd63185f5d855251e2bf3b126 Mon Sep 17 00:00:00 2001 From: Zhigulin Pavel Date: Wed, 19 Dec 2018 12:37:18 +0300 Subject: [PATCH 2/3] Use awk to parse cargo --list --- src/etc/cargo.bashcomp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/etc/cargo.bashcomp.sh b/src/etc/cargo.bashcomp.sh index ef5bbabd9f3..1454525955f 100644 --- a/src/etc/cargo.bashcomp.sh +++ b/src/etc/cargo.bashcomp.sh @@ -120,7 +120,7 @@ _cargo() } && complete -F _cargo cargo -__cargo_commands=$(cargo --list 2>/dev/null | tail -n +2 | sed -E -e "s/^\s+//g" | cut -d" " -f1) +__cargo_commands=$(cargo --list 2>/dev/null | tail -n +2 | awk 'NR>1 {print $1}') _locate_manifest(){ local manifest=`cargo locate-project 2>/dev/null` From 56fec5c07d1cbb2e609069f0dba95ccb5aac64dd Mon Sep 17 00:00:00 2001 From: Zhigulin Pavel Date: Thu, 20 Dec 2018 14:01:22 +0300 Subject: [PATCH 3/3] Remove tail call --- src/etc/cargo.bashcomp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/etc/cargo.bashcomp.sh b/src/etc/cargo.bashcomp.sh index 1454525955f..bfc64b2bbb7 100644 --- a/src/etc/cargo.bashcomp.sh +++ b/src/etc/cargo.bashcomp.sh @@ -120,7 +120,7 @@ _cargo() } && complete -F _cargo cargo -__cargo_commands=$(cargo --list 2>/dev/null | tail -n +2 | awk 'NR>1 {print $1}') +__cargo_commands=$(cargo --list 2>/dev/null | awk 'NR>1 {print $1}') _locate_manifest(){ local manifest=`cargo locate-project 2>/dev/null`