File tree Expand file tree Collapse file tree 2 files changed +16
-8
lines changed Expand file tree Collapse file tree 2 files changed +16
-8
lines changed Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
29
29
refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
30
30
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
31
31
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
32
- refs/heads/beta: fb78ca8b763e57c83d9269a97b9f374aeed7d0b2
32
+ refs/heads/beta: ee3dffac4939c24d8c6412dc12dc1bd388494f40
33
33
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
34
34
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
35
35
refs/heads/tmp: 9de34a84bb300bab1bf0227f577331620cd60511
Original file line number Diff line number Diff line change @@ -288,6 +288,7 @@ VAL_OPTIONS=""
288
288
flag uninstall " only uninstall from the installation prefix"
289
289
valopt prefix " " " set installation prefix"
290
290
valopt date " " " use the YYYY-MM-DD nightly instead of the current nightly"
291
+ valopt channel " nightly" " use the selected release channel [nightly]"
291
292
flag save " save the downloaded nightlies to ~/.rustup"
292
293
293
294
if [ $HELP -eq 1 ]
@@ -449,18 +450,25 @@ then
449
450
fi
450
451
451
452
RUST_URL=" https://static.rust-lang.org/dist"
452
- RUST_PACKAGE_NAME=rust-nightly
453
+ case " $CFG_CHANNEL " in
454
+ nightly)
455
+ # add a date suffix if we want a particular nighly.
456
+ if [ -n " ${CFG_DATE} " ];
457
+ then
458
+ RUST_URL=" ${RUST_URL} /${CFG_DATE} "
459
+ fi
460
+
461
+ RUST_PACKAGE_NAME=rust-nightly
462
+ ;;
463
+ * )
464
+ err " Currently nightly is the only supported release channel"
465
+ esac
466
+
453
467
RUST_PACKAGE_NAME_AND_TRIPLE=" ${RUST_PACKAGE_NAME} -${HOST_TRIPLE} "
454
468
RUST_TARBALL_NAME=" ${RUST_PACKAGE_NAME_AND_TRIPLE} .tar.gz"
455
469
RUST_LOCAL_INSTALL_DIR=" ${CFG_TMP_DIR} /${RUST_PACKAGE_NAME_AND_TRIPLE} "
456
470
RUST_LOCAL_INSTALL_SCRIPT=" ${RUST_LOCAL_INSTALL_DIR} /install.sh"
457
471
458
- # add a date suffix if we want a particular nighly.
459
- if [ -n " ${CFG_DATE} " ];
460
- then
461
- RUST_URL=" ${RUST_URL} /${CFG_DATE} "
462
- fi
463
-
464
472
download_hash () {
465
473
msg " Downloading ${remote_sha256} "
466
474
remote_sha256=` " ${CFG_CURL} " -f " ${remote_sha256} " `
You can’t perform that action at this time.
0 commit comments