mirror/tor
0
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 12:22:14 +02:00
Code

Merge remote-tracking branch 'tor-github/pr/531'

Browse Source
This commit is contained in:
Nick Mathewson 2018-12-05 09:02:49 -05:00
commit d4f558e385
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket28012 Normal file
View File

@ -0,0 +1,3 @@
o Code simplification and refactoring:
- Fix issues that shellcheck found in updateRustDependencies.sh.
Resolves ticket 28012.

18
scripts/maint/updateRustDependencies.sh
View File

@ -20,26 +20,26 @@
set -e
HERE=`dirname $(realpath $0)`
TOPLEVEL=`dirname $(dirname $HERE)`
HERE=$(dirname "$(realpath "$0")")
TOPLEVEL=$(dirname "$(dirname "$HERE")")
TOML="$TOPLEVEL/src/rust/Cargo.toml"
VENDORED="$TOPLEVEL/src/ext/rust/crates"
CARGO=`which cargo`
CARGO=$(command -v cargo)
if ! test -f "$TOML" ; then
printf "Error: Couldn't find workspace Cargo.toml in expected location: %s\n" "$TOML"
printf "Error: Couldn't find workspace Cargo.toml in expected location: %s\\n" "$TOML"
fi
if ! test -d "$VENDORED" ; then
printf "Error: Couldn't find directory for Rust dependencies! Expected location: %s\n" "$VENDORED"
printf "Error: Couldn't find directory for Rust dependencies! Expected location: %s\\n" "$VENDORED"
fi
if test -z "$CARGO" ; then
printf "Error: cargo must be installed and in your \$PATH\n"
printf "Error: cargo must be installed and in your \$PATH\\n"
fi
if test -z `cargo --list | grep vendor` ; then
printf "Error: cargo-vendor not installed\n"
if test -z "$(cargo --list | grep vendor)" ; then
printf "Error: cargo-vendor not installed\\n"
fi
$CARGO vendor -v --locked --explicit-version --no-delete --sync $TOML $VENDORED
$CARGO vendor -v --locked --explicit-version --no-delete --sync "$TOML" "$VENDORED"