Merge remote-tracking branch 'origin/main' into sorin/consolidation

jthurne · jthurne · commit aa746ec23565 · 2024-05-03T08:54:58.000+02:00
* origin/main: Bump com.google.guava:guava from 33.1.0-jre to 33.2.0-jre (#611) Fix running argbash on MacOS (#609)
diff --git a/buildSrc/src/main/kotlin/ApplyArgbash.kt b/buildSrc/src/main/kotlin/ApplyArgbash.kt
@@ -50,7 +50,7 @@ abstract class ApplyArgbash @Inject constructor(
 
                 logger.info("Applying argbash to $file")
                 execOperations.exec {
-                    commandLine(argbash, file, "-o", outputFile)
+                    commandLine("/usr/bin/env", "bash", argbash, file, "-o", outputFile)
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ abstract class ApplyArgbash @Inject constructor(`
`50`	`50`
`51`	`51`	`logger.info("Applying argbash to $file")`
`52`	`52`	`execOperations.exec {`
`53`		`- commandLine(argbash, file, "-o", outputFile)`
	`53`	`+ commandLine("/usr/bin/env", "bash", argbash, file, "-o", outputFile)`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`}`