feat(args): convert braced variables in command args

kentcdodds · Mar 14, 2017 · a53f3e6 · a53f3e6
1 parent 371ac46
commit a53f3e6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/command.js b/src/command.js
@@ -2,8 +2,8 @@ import isWindows from 'is-windows'
 
 export default commandConvert
 
-const envUseUnixRegex = /\$(\w+)/ // $my_var
-const envUseWinRegex = /%(.*?)%/ // %my_var%
+const envUseUnixRegex = /\$(\w+)|\${(\w+)}/g // $my_var or ${my_var}
+const envUseWinRegex = /%(.*?)%/g // %my_var%
 
 /**
  * Converts an environment variable usage to be appropriate for the current OS
@@ -13,5 +13,5 @@ const envUseWinRegex = /%(.*?)%/ // %my_var%
 function commandConvert(command) {
   const isWin = isWindows()
   const envExtract = isWin ? envUseUnixRegex : envUseWinRegex
-  return command.replace(envExtract, isWin ? '%$1%' : '$$$1')
+  return command.replace(envExtract, isWin ? '%$1$2%' : '$$$1')
 }
diff --git a/src/command.test.js b/src/command.test.js
@@ -51,3 +51,9 @@ test(`
   isWindowsMock.__mock.returnValue = false
   expect(commandConvert('$test1/$test2/$test3')).toBe('$test1/$test2/$test3')
 })
+
+test(`converts braced unix-style env variable usage for windows`, () => {
+  isWindowsMock.__mock.returnValue = true
+  // eslint-disable-next-line no-template-curly-in-string
+  expect(commandConvert('${test}')).toBe('%test%')
+})