p1r0
/
rustlings
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(install): protect path with whitespaces using quotes and stop at the first error

This commit is contained in:
Pascal Havé 2022-04-03 19:49:59 +02:00
parent 0bd7a0631a
commit d114847f25
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
install.sh
View File

@ -1,4 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -euo pipefail
echo "Let's get you set up with Rustlings!" echo "Let's get you set up with Rustlings!"
@ -100,8 +101,8 @@ function vercomp() {
RustVersion=$(rustc --version | cut -d " " -f 2) RustVersion=$(rustc --version | cut -d " " -f 2)
MinRustVersion=1.39 MinRustVersion=1.39
vercomp $RustVersion $MinRustVersion vercomp "$RustVersion" $MinRustVersion || ec=$?
if [ $? -eq 2 ] if [ ${ec:-0} -eq 2 ]
then then
echo "ERROR: Rust version is too old: $RustVersion - needs at least $MinRustVersion" echo "ERROR: Rust version is too old: $RustVersion - needs at least $MinRustVersion"
echo "Please update Rust with 'rustup update'" echo "Please update Rust with 'rustup update'"
@ -112,9 +113,9 @@ fi
Path=${1:-rustlings/} Path=${1:-rustlings/}
echo "Cloning Rustlings at $Path..." echo "Cloning Rustlings at $Path..."
git clone -q https://github.com/rust-lang/rustlings $Path git clone -q https://github.com/rust-lang/rustlings "$Path"
cd $Path cd "$Path"
Version=$(curl -s https://api.github.com/repos/rust-lang/rustlings/releases/latest | ${PY} -c "import json,sys;obj=json.load(sys.stdin);print(obj['tag_name']);") Version=$(curl -s https://api.github.com/repos/rust-lang/rustlings/releases/latest | ${PY} -c "import json,sys;obj=json.load(sys.stdin);print(obj['tag_name']);")
CargoBin="${CARGO_HOME:-$HOME/.cargo}/bin" CargoBin="${CARGO_HOME:-$HOME/.cargo}/bin"