From 58e425039a1dc78cde64e9c1939e2a3dfed6d22a Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Mon, 22 Aug 2022 19:45:11 -0400
Subject: fix rust error when choose a non-default version. (#111)

port of https://github.com/microsoft/vscode-dev-containers/pull/1592
---
 src/rust/devcontainer-feature.json | 2 +-
 src/rust/install.sh                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index 016e464..8212b34 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "name": "Rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
     "options": {
diff --git a/src/rust/install.sh b/src/rust/install.sh
index 3970bb2..a84716c 100755
--- a/src/rust/install.sh
+++ b/src/rust/install.sh
@@ -179,8 +179,8 @@ else
             apt-get -y install --no-install-recommends git
         fi
 
-        echo ${RUST_VERSION} | grep -q "nightly"
-        is_nightly=$?
+        is_nightly=0
+        echo ${RUST_VERSION} | grep -q "nightly" || is_nightly=$?
         if [ $is_nightly = 0 ]; then
             check_nightly_version_formatting RUST_VERSION
         else
-- 
cgit v1.2.3