From 26587e8a61acfdd3638ef325445eb57c5ebd9bce Mon Sep 17 00:00:00 2001
From: Michael Thomsen <mit@google.com>
Date: Mon, 11 Oct 2021 11:10:36 +0200
Subject: [PATCH 1/4] Update setup.sh

---
 setup.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index 9aa1283..0eb4ee1 100755
--- a/setup.sh
+++ b/setup.sh
@@ -88,14 +88,16 @@ rm "${HOME}/dartsdk.zip"
 if [[ $OS == windows ]]
 then
   PUBCACHE="${USERPROFILE}\\.pub-cache"
+  DARTHOME="${RUNNER_TOOL_CACHE}\\dart-sdk"
 else
   PUBCACHE="${HOME}/.pub-cache"
+  DARTHOME="${RUNNER_TOOL_CACHE}/dart-sdk"
 fi
 echo "PUB_CACHE=${PUBCACHE}" >> $GITHUB_ENV
 echo "Pub cache set to: ${PUBCACHE}"
 
 # Update paths.
-echo "DART_HOME=${RUNNER_TOOL_CACHE}/dart-sdk/" >> $GITHUB_ENV
+echo "DART_HOME=${DARTHOME}" >> $GITHUB_ENV
 echo "${PUBCACHE}/bin" >> $GITHUB_PATH
 echo "${RUNNER_TOOL_CACHE}/dart-sdk/bin" >> $GITHUB_PATH
 

From 4736b01af5fc898e8645b274283d7ed0215d3de1 Mon Sep 17 00:00:00 2001
From: Michael Thomsen <mit@google.com>
Date: Mon, 11 Oct 2021 11:18:30 +0200
Subject: [PATCH 2/4] Update dart.yml

---
 .github/workflows/dart.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 27c5fe7..0c43fcb 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -23,6 +23,9 @@ jobs:
         with:
           sdk: ${{ matrix.sdk }}
 
+      - name: Print DART_HOME
+        run: echo "Dart SDK installed in $DART_HOME"
+
       - name: Run hello world
         run: |
           echo "main() { print('hello world'); }" > hello.dart

From 04220c2cea8ebf23a8e0b5e0b332746d7d553155 Mon Sep 17 00:00:00 2001
From: Michael Thomsen <mit@google.com>
Date: Mon, 11 Oct 2021 11:28:27 +0200
Subject: [PATCH 3/4] Update dart.yml

---
 .github/workflows/dart.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 0c43fcb..20da2a9 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -24,6 +24,7 @@ jobs:
           sdk: ${{ matrix.sdk }}
 
       - name: Print DART_HOME
+        shell: bash
         run: echo "Dart SDK installed in $DART_HOME"
 
       - name: Run hello world

From f32ad5b15da446900bcdd6ec5af466c0ad92b6bb Mon Sep 17 00:00:00 2001
From: Michael Thomsen <mit@google.com>
Date: Mon, 11 Oct 2021 16:03:40 +0200
Subject: [PATCH 4/4] Review feedback

---
 setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.sh b/setup.sh
index 0eb4ee1..9d04558 100755
--- a/setup.sh
+++ b/setup.sh
@@ -88,16 +88,16 @@ rm "${HOME}/dartsdk.zip"
 if [[ $OS == windows ]]
 then
   PUBCACHE="${USERPROFILE}\\.pub-cache"
-  DARTHOME="${RUNNER_TOOL_CACHE}\\dart-sdk"
+  DART_HOME="${RUNNER_TOOL_CACHE}\\dart-sdk"
 else
   PUBCACHE="${HOME}/.pub-cache"
-  DARTHOME="${RUNNER_TOOL_CACHE}/dart-sdk"
+  DART_HOME="${RUNNER_TOOL_CACHE}/dart-sdk"
 fi
 echo "PUB_CACHE=${PUBCACHE}" >> $GITHUB_ENV
 echo "Pub cache set to: ${PUBCACHE}"
 
 # Update paths.
-echo "DART_HOME=${DARTHOME}" >> $GITHUB_ENV
+echo "DART_HOME=${DART_HOME}" >> $GITHUB_ENV
 echo "${PUBCACHE}/bin" >> $GITHUB_PATH
 echo "${RUNNER_TOOL_CACHE}/dart-sdk/bin" >> $GITHUB_PATH