rustup cargo install-upgrade

Author: tesuji

setup-toolchain.sh

@@ -5,14 +5,13 @@ set -e
 
 cd "$(dirname "$0")"
 
-ERRNO=0
-RTIM_PATH=$(command -v rustup-toolchain-install-master) || ERRNO=$?
+RTIM_PATH=$(command -v rustup-toolchain-install-master)
 CARGO_HOME=${CARGO_HOME:-$HOME/.cargo}
 
 # Check if people also install RTIM in other locations beside
 # ~/.cargo/bin
-if [[ "$ERRNO" -ne 0 ]] || [[ "$RTIM_PATH" == $CARGO_HOME/bin/rustup-toolchain-install-master ]]; then
-    cargo install -Z install-upgrade rustup-toolchain-install-master
+if [[ "$RTIM_PATH" == $CARGO_HOME/bin/rustup-toolchain-install-master ]]; then
+    cargo +nightly install rustup-toolchain-install-master
 else
     VERSION=$(rustup-toolchain-install-master -V | grep -o "[0-9.]*")
     REMOTE=$(cargo search rustup-toolchain-install-master | grep -o "[0-9.]*")