forked from wrenn/wrenn
Fix expandEnv regex, init script crash, healthcheck deadline, and test issues
- Fix envRegex: remove spurious (\$)? group that swallowed $$$, handle ${}
- wrenn-init.sh: add || true to networking commands under set -e, remove dead code
- waitForHealthcheck: use context deadline for unlimited retries instead of implicit 100 cap
- Make parseSandboxEnv a package-level function (unused receiver)
- Fix WrappedCommand test: map iteration order dependency, pre-expand env values
- Fix error wrapping: %v → %w per project conventions
- test-jupyter-kernel.py: move import to top-level, fix misleading comment
This commit is contained in:
@ -13,10 +13,10 @@ type ExecContext struct {
|
||||
}
|
||||
|
||||
// This regex matches:
|
||||
// 1. $$
|
||||
// 2. ${ANY_WORD}
|
||||
// 3. $ANY_WORD
|
||||
var envRegex = regexp.MustCompile(`\$\$(\$)?|\$\{([a-zA-Z0-9_]+)\}|\$([a-zA-Z0-9_]+)`)
|
||||
// 1. $$ (escaped dollar)
|
||||
// 2. ${VAR} or ${} (braced variable, possibly empty)
|
||||
// 3. $VAR (bare variable)
|
||||
var envRegex = regexp.MustCompile(`\$\$|\$\{([a-zA-Z0-9_]*)\}|\$([a-zA-Z0-9_]+)`)
|
||||
|
||||
// WrappedCommand returns the full shell command for a RUN step with context
|
||||
// applied. The result is passed as the argument to /bin/sh -c.
|
||||
@ -77,7 +77,7 @@ func expandEnv(s string, vars map[string]string) string {
|
||||
}
|
||||
|
||||
var name string
|
||||
if match[1] == '{' {
|
||||
if len(match) > 1 && match[1] == '{' {
|
||||
name = match[2 : len(match)-1]
|
||||
} else {
|
||||
name = match[1:]
|
||||
|
||||
Reference in New Issue
Block a user