Fix resolving of variables for che commands

plugins/task-plugin/src/task/che-task-provider.ts

@@ -10,7 +10,7 @@
 
 import { injectable, inject } from 'inversify';
 import * as che from '@eclipse-che/plugin';
-import { Task } from '@theia/plugin';
+import { Task, ShellExecution } from '@theia/plugin';
 import { CHE_TASK_TYPE, CheTaskDefinition, Target } from './task-protocol';
 import { MachinesPicker } from '../machine/machines-picker';
 import { CheWorkspaceClient } from '../che-workspace-client';
@@ -55,17 +55,20 @@ export class CheTaskProvider {
             resultTarget.workingDir = target.workingDir;
         }
 
-        const command = await che.variables.resolve(cheTaskDefinition.command);
+        const execution = task.execution as ShellExecution;
+        if (execution && execution.command) {
+            execution.command = await che.variables.resolve(execution.command as string);
+        }
+
         return {
             definition: {
                 type: taskType,
-                command: command,
                 target: resultTarget,
                 previewUrl: cheTaskDefinition.previewUrl
             },
             name: task.name,
             source: task.source,
-            execution: task.execution
+            execution: execution
         };
     }
 }

plugins/task-plugin/src/task/task-protocol.ts

@@ -17,7 +17,6 @@ export const WORKING_DIR_ATTRIBUTE: string = 'workingDir';
 
 export interface CheTaskDefinition extends TaskDefinition {
     readonly target?: Target,
-    readonly command: string,
     readonly previewUrl?: string
 }