Detect rustfilt even when CARGO_BIN isn't in PATH

trailofbits · Jul 31, 2019 · f0693a0 · f0693a0
1 parent 7a888f5
commit f0693a0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/setup.sh b/setup.sh
@@ -13,7 +13,11 @@ fi
 echo "building siderophile"
 cargo build --release
 
-if !(hash rustfilt) 2>/dev/null; then
+# Where to look for `rustfilt`. If CARGO_HOME is set, use $CARGO_HOME/bin.
+# Otherwise, use ~/.cargo/bin
+CARGO_BIN=${CARGO_HOME:-~/.cargo}/bin
+
+if !(PATH="$PATH:$CARGO_BIN" hash rustfilt) 2>/dev/null; then
     echo "didn't find rustfilt, installing it now"
     cargo install rustfilt
 fi