Skip to content

Change behavior of DEVTOOLS_TOOL_FLUTTER_FROM_PATH #10001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
srawlins wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change behavior of DEVTOOLS_TOOL_FLUTTER_FROM_PATH #10001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tool/bin/dt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

USE_PATH=false
if [ ! -z "$DEVTOOLS_TOOL_FLUTTER_FROM_PATH" ]; then
if [ "$DEVTOOLS_TOOL_FLUTTER_FROM_PATH" = "true" ]; then
USE_PATH=true
fi
Comment thread
srawlins marked this conversation as resolved.
for arg in "$@"; do
Expand Down
2 changes: 1 addition & 1 deletion tool/bin/dt.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ REM found in the LICENSE file or at https://developers.google.com/open-source/li
@echo off

set USE_PATH=
IF DEFINED DEVTOOLS_TOOL_FLUTTER_FROM_PATH set USE_PATH=1
IF /I "%DEVTOOLS_TOOL_FLUTTER_FROM_PATH%"=="true" set USE_PATH=1
for %%a in (%*) do (
if "%%a"=="-p" set USE_PATH=1
if "%%a"=="--flutter-from-path" set USE_PATH=1
Expand Down
8 changes: 4 additions & 4 deletions tool/ci/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ function flutter {
export -f flutter

# Determine the Flutter SDK to use:
# * If `DEVTOOLS_TOOL_FLUTTER_FROM_PATH` is set, then discover from `PATH`.
# * If `DEVTOOLS_TOOL_FLUTTER_FROM_PATH` is "true", then discover from `PATH`.
# * If `./tool/flutter-sdk` (a directory) exists, then use that.
if [ -n "$DEVTOOLS_TOOL_FLUTTER_FROM_PATH" ]; then
if [ "$DEVTOOLS_TOOL_FLUTTER_FROM_PATH" = "true" ]; then
Comment thread
srawlins marked this conversation as resolved.
if command -v flutter &> /dev/null; then
FLUTTER_EXE="$(command -v flutter)"
elif command -v flutter.bat &> /dev/null; then
FLUTTER_EXE="$(command -v flutter.bat)"
else
echo "DEVTOOLS_TOOL_FLUTTER_FROM_PATH is set, but flutter was not found on PATH"
echo "DEVTOOLS_TOOL_FLUTTER_FROM_PATH is set to true, but flutter was not found on PATH"
exit 1
fi
FLUTTER_BIN="$(cd "$(dirname "$FLUTTER_EXE")" && pwd -P)"
Expand All @@ -40,7 +40,7 @@ if [ -n "$DEVTOOLS_TOOL_FLUTTER_FROM_PATH" ]; then
elif [ -d "./tool/flutter-sdk" ]; then
FLUTTER_DIR="$(pwd)/tool/flutter-sdk"
else
echo "Expected ./tool/flutter-sdk to exist, or DEVTOOLS_TOOL_FLUTTER_FROM_PATH to be set"
echo "Expected ./tool/flutter-sdk to exist, or DEVTOOLS_TOOL_FLUTTER_FROM_PATH to be set to true"
exit 1
fi

Expand Down
4 changes: 3 additions & 1 deletion tool/lib/devtools_command_runner.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,10 @@ class DevToolsCommandRunner extends CommandRunner {

@override
Future<void> runCommand(ArgResults topLevelResults) {
final flutterFromPathEnvValue =
Platform.environment[_flutterFromPathEnvVar] ?? '';
final flutterFromPathEnv =
Platform.environment[_flutterFromPathEnvVar]?.isNotEmpty == true;
bool.tryParse(flutterFromPathEnvValue, caseSensitive: false) == true;
if (topLevelResults.flag(_flutterFromPathFlag) &&
topLevelResults.wasParsed(_flutterSdkPathFlag)) {
throw ArgParserException(
Expand Down
Loading