Safer cargo command (#9437) (#9440)

mergify[bot] · web-flow · commit 967c178f5d1a · 2020-04-10T16:54:33.000-07:00
automerge
diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
@@ -36,7 +36,12 @@ download() {
 # Install xargo
 (
   set -ex
-  cargo +"${rust_stable:-}" install xargo
+  # shellcheck disable=SC2154
+  if [[ -n $rust_stable ]]; then
+    cargo +"$rust_stable" install xargo
+  else
+    cargo install xargo
+  fi
   xargo --version > xargo.md 2>&1
 )
 # shellcheck disable=SC2181

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,12 @@ download() {`
`36`	`36`	`# Install xargo`
`37`	`37`	`(`
`38`	`38`	`set -ex`
`39`		`- cargo +"${rust_stable:-}" install xargo`
	`39`	`+ # shellcheck disable=SC2154`
	`40`	`+ if [[ -n $rust_stable ]]; then`
	`41`	`+ cargo +"$rust_stable" install xargo`
	`42`	`+ else`
	`43`	`+ cargo install xargo`
	`44`	`+ fi`
`40`	`45`	`xargo --version > xargo.md 2>&1`
`41`	`46`	`)`
`42`	`47`	`# shellcheck disable=SC2181`