diff --git a/appveyor.yml b/appveyor.yml index e0baced33..3689edf40 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,6 @@ install: - ps: wget https://storage.googleapis.com/dart-archive/channels/dev/release/latest/sdk/dartsdk-windows-x64-release.zip -OutFile dart-sdk.zip - cmd: echo "Unzipping dart-sdk..." - cmd: 7z x dart-sdk.zip -o"C:\tools" -y > nul - - set PATH=%PATH%;C:\tools\dart-sdk\bin - set PATH=%PATH%;%APPDATA%\Pub\Cache\bin - cd webdev - pub get && exit 0 diff --git a/webdev/lib/src/pubspec.dart b/webdev/lib/src/pubspec.dart index ad83ae820..8055731e2 100644 --- a/webdev/lib/src/pubspec.dart +++ b/webdev/lib/src/pubspec.dart @@ -38,7 +38,7 @@ class PackageExceptionDetails { } Future _runPubDeps() async { - var result = Process.runSync('pub', ['deps'], runInShell: true); + var result = Process.runSync(pubPath, ['deps']); if (result.exitCode == 65 || result.exitCode == 66) { throw new PackageException._( diff --git a/webdev/lib/src/util.dart b/webdev/lib/src/util.dart index 2b5543b35..f0d13f0e1 100644 --- a/webdev/lib/src/util.dart +++ b/webdev/lib/src/util.dart @@ -22,6 +22,7 @@ final String _sdkDir = (() { return aboveExecutable; })(); -final String dartPath = p.join(_sdkDir, 'bin', 'dart'); +final String dartPath = + p.join(_sdkDir, 'bin', Platform.isWindows ? 'dart.exe' : 'dart'); final String pubPath = p.join(_sdkDir, 'bin', Platform.isWindows ? 'pub.bat' : 'pub'); diff --git a/webdev/test/integration_test.dart b/webdev/test/integration_test.dart index 4760c296d..aeafed822 100644 --- a/webdev/test/integration_test.dart +++ b/webdev/test/integration_test.dart @@ -208,9 +208,7 @@ dependencies: test('should succeed with valid configuration', () async { var exampleDirectory = p.absolute(p.join(p.current, '..', 'example')); var process = await TestProcess.start(pubPath, ['get'], - workingDirectory: exampleDirectory, - environment: _getPubEnvironment(), - runInShell: true); + workingDirectory: exampleDirectory, environment: _getPubEnvironment()); await process.shouldExit(0);