Skip to content

Commit ddc26c7

Browse files
authored
Update install.sh
1 parent 4c08900 commit ddc26c7

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

src/rust/install.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -376,11 +376,13 @@ else
376376
fi
377377
default_toolchain_arg="--default-toolchain ${RUST_VERSION}"
378378
fi
379+
export RUSTUP_DIST_SERVER="${RUSTUP_DIST_SERVER:-https://static.rust-lang.org}"
380+
export RUSTUP_UPDATE_ROOT="${RUSTUP_UPDATE_ROOT:-https://static.rust-lang.org/rustup}"
379381
echo "Installing Rust..."
380382
# Download and verify rustup sha
381383
mkdir -p /tmp/rustup/target/${download_architecture}-unknown-linux-gnu/release/
382-
curl -sSL --proto '=https' --tlsv1.2 "https://static.rust-lang.org/rustup/dist/${download_architecture}-unknown-linux-gnu/rustup-init" -o /tmp/rustup/target/${download_architecture}-unknown-linux-gnu/release/rustup-init
383-
curl -sSL --proto '=https' --tlsv1.2 "https://static.rust-lang.org/rustup/dist/${download_architecture}-unknown-linux-gnu/rustup-init.sha256" -o /tmp/rustup/rustup-init.sha256
384+
curl -sSL --proto '=https' --tlsv1.2 "${RUSTUP_DIST_SERVER}/rustup/dist/${download_architecture}-unknown-linux-gnu/rustup-init" -o /tmp/rustup/target/${download_architecture}-unknown-linux-gnu/release/rustup-init
385+
curl -sSL --proto '=https' --tlsv1.2 "${RUSTUP_DIST_SERVER}/rustup/dist/${download_architecture}-unknown-linux-gnu/rustup-init.sha256" -o /tmp/rustup/rustup-init.sha256
384386
cd /tmp/rustup
385387
cp /tmp/rustup/target/${download_architecture}-unknown-linux-gnu/release/rustup-init /tmp/rustup/rustup-init
386388
sha256sum -c rustup-init.sha256
@@ -390,9 +392,6 @@ else
390392
rm -rf /tmp/rustup
391393
fi
392394

393-
export RUSTUP_DIST_SERVER="${RUSTUP_DIST_SERVER:-https://static.rust-lang.org}"
394-
export RUSTUP_UPDATE_ROOT="${RUSTUP_UPDATE_ROOT:-https://static.rust-lang.org/rustup}"
395-
396395
export PATH=${CARGO_HOME}/bin:${PATH}
397396
if [ "${UPDATE_RUST}" = "true" ]; then
398397
echo "Updating Rust..."

0 commit comments

Comments
 (0)