From 58e3dd4cb624240c1976d6c90eca7d78667e4f7d Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Mon, 26 Nov 2018 15:40:39 -0800 Subject: [PATCH] Avoid trying to install svgbob when already installed --- ci/test-stable.sh | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/ci/test-stable.sh b/ci/test-stable.sh index 0b0956379d..3ed99e72ab 100755 --- a/ci/test-stable.sh +++ b/ci/test-stable.sh @@ -13,15 +13,20 @@ _() { } maybe_install() { - for cmd in "$@"; do - set +e - "$cmd" --help > /dev/null 2>&1 - declare exitcode=$? - set -e - if [[ $exitcode -ne 0 ]]; then - _ cargo install "$cmd" - fi - done + declare cmd=$1 + declare crate=$2 + + if [[ -z $crate ]]; then + crate=$cmd + fi + + set +e + "$cmd" --help > /dev/null 2>&1 + declare exitcode=$? + set -e + if [[ $exitcode -ne 0 ]]; then + _ cargo install "$crate" + fi } _ cargo build --all --verbose @@ -47,7 +52,7 @@ done # Build the HTML export PATH=$CARGO_HOME/bin:$PATH maybe_install mdbook -maybe_install svgbob_cli +maybe_install svgbob svgbob_cli _ make -C book echo --- ci/localnet-sanity.sh