From aeb7ba0530e077a5437f33efd321f05cb18cb610 Mon Sep 17 00:00:00 2001 From: Tyler Butler Date: Wed, 16 Nov 2022 17:50:59 -0800 Subject: [PATCH 1/2] fix(fluid-build): Parse build-cli tasks properly in fluid-build --- .../packages/build-tools/src/common/utils.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/build-tools/packages/build-tools/src/common/utils.ts b/build-tools/packages/build-tools/src/common/utils.ts index eab1dde862ba..028f8acfea21 100644 --- a/build-tools/packages/build-tools/src/common/utils.ts +++ b/build-tools/packages/build-tools/src/common/utils.ts @@ -10,7 +10,19 @@ import * as path from "path"; import * as util from "util"; export function getExecutableFromCommand(command: string) { - return command.split(" ")[0]; + let toReturn: string; + const commands = command.split(" "); + if (commands[0] === "flub") { + // Find the first flag argument, and filter them out. Assumes flags come at the end of the command, and that all + // subsequent arguments are flags. + const flagsStartIndex = commands.findIndex((c) => c.startsWith("-")); + toReturn = commands.slice(0, flagsStartIndex).join(" "); + } else { + toReturn = commands[0]; + } + + console.log(`"${command}" => "${toReturn}"`); + return toReturn; } export function toPosixPath(s: string) { From dcf43fdfdc6ff4656dc449ebf16d5ef131bd37e3 Mon Sep 17 00:00:00 2001 From: Tyler Butler Date: Wed, 16 Nov 2022 17:53:39 -0800 Subject: [PATCH 2/2] Update build-tools/packages/build-tools/src/common/utils.ts --- build-tools/packages/build-tools/src/common/utils.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-tools/packages/build-tools/src/common/utils.ts b/build-tools/packages/build-tools/src/common/utils.ts index 028f8acfea21..836be819dc87 100644 --- a/build-tools/packages/build-tools/src/common/utils.ts +++ b/build-tools/packages/build-tools/src/common/utils.ts @@ -20,8 +20,6 @@ export function getExecutableFromCommand(command: string) { } else { toReturn = commands[0]; } - - console.log(`"${command}" => "${toReturn}"`); return toReturn; }