From 19ad8ab0b3d8ee7a9890bed7a8f845f954a28898 Mon Sep 17 00:00:00 2001 From: Richard Willis Date: Tue, 5 Nov 2019 21:05:21 +0100 Subject: [PATCH] Add support for git bash on Windows. Fixes #24 --- package.json | 2 +- src/config.ts | 4 ++-- src/tasks.ts | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 4fbb507e3..7c161b813 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ }, "gradle.enableTasksExplorer": { "type": "boolean", - "default": false, + "default": true, "description": "Enable an explorer view for gradle tasks" }, "gradle.tasksArgs": { diff --git a/src/config.ts b/src/config.ts index f6ad7192d..20071906e 100644 --- a/src/config.ts +++ b/src/config.ts @@ -12,14 +12,14 @@ export function getIsAutoDetectionEnabled(folder: WorkspaceFolder): boolean { return ( workspace .getConfiguration('gradle', folder.uri) - .get('autoDetect') === 'on' + .get('autoDetect', 'on') === 'on' ); } export function getTasksArgs(folder: WorkspaceFolder): string { return workspace .getConfiguration('gradle', folder.uri) - .get('tasksArgs', ''); + .get('tasksArgs', '--all'); } export function getIsTasksExplorerEnabled(): boolean { diff --git a/src/tasks.ts b/src/tasks.ts index 03c06b982..bddb41146 100644 --- a/src/tasks.ts +++ b/src/tasks.ts @@ -112,12 +112,12 @@ async function getGradleWrapperCommandFromFolder( platform === 'win32' && (await exists(path.join(folder.uri.fsPath!, 'gradlew.bat'))) ) { - return path.join(folder.uri.fsPath!, 'gradlew.bat'); + return '.\\gradlew.bat'; } else if ( (platform === 'linux' || platform === 'darwin') && (await exists(path.join(folder.uri.fsPath!, 'gradlew'))) ) { - return path.join(folder.uri.fsPath!, 'gradlew'); + return './gradlew'; } else { throw new Error('Gradle wrapper executable not found'); } @@ -252,7 +252,7 @@ export function createTask( if (customBuildFile) { args.push('--build-file', customBuildFile); } - return `${command} ${args.join(' ')}`; + return `"${command}" ${args.join(' ')}`; } function getRelativePath(