Skip to content

Commit 2fde878

Browse files
committed
feat(action): update setup.sh script
1 parent c94e468 commit 2fde878

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

setup.sh

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
# Options
44
ARCH=$(echo "${RUNNER_ARCH:-x64}" | awk '{print tolower($0)}')
5-
OS=$(echo "${RUNNER_OS:-macOS}" | awk '{print tolower($0)}')
5+
OS=$(echo "${RUNNER_OS:-linux}" | awk '{print tolower($0)}')
66

77
# Args
88
FLUTTER_VERSION=${1:-3.0.2}
99
FLUTTER_CHANNEL=${2:-stable}
1010
FLUTTER_OS=$OS
11-
FLUTTER_ARCH=""
1211

1312
# OS archive file extension
1413
EXT="zip"
@@ -18,12 +17,9 @@ then
1817
fi
1918

2019
# Apple Intel or Apple Silicon
21-
if [[ $OS == macos ]]
20+
if [[ $OS == macos && $ARCH == 'arm64' ]]
2221
then
23-
if [[ $ARCH == 'arm64' ]]
24-
then
25-
FLUTTER_ARCH="_$ARCH"
26-
fi
22+
FLUTTER_OS="${FLUTTER_OS}_$ARCH"
2723
fi
2824

2925
# Flutter runner tool cache
@@ -53,7 +49,7 @@ if [ ! -d "${FLUTTER_RUNNER_TOOL_CACHE}" ]; then
5349
# Windows
5450
# /stable /windows/ flutter_windows_3.0.2-stable.zip
5551
# /beta /windows/ flutter_windows_3.1.0-9.0.pre-beta.zip
56-
FLUTTER_BUILD="flutter_${FLUTTER_OS}${FLUTTER_ARCH}_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.${EXT}"
52+
FLUTTER_BUILD="flutter_${FLUTTER_OS}_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.${EXT}"
5753
FLUTTER_DOWNLOAD_URL="${FLUTTER_RELEASE_URL}/${FLUTTER_CHANNEL}/${FLUTTER_OS}/${FLUTTER_BUILD}"
5854

5955
echo "Downloading ${FLUTTER_DOWNLOAD_URL}"

0 commit comments

Comments
 (0)