Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Trailing colons in env breaks things #929

Merged
merged 2 commits into from
Jan 16, 2024
Merged

Trailing colons in env breaks things #929

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9eb602
Trailing colons in env breaks things
mxcl Jan 16, 2024
38fbe55
wip
mxcl Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/prefab/construct-env.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Deno.test("construct_env.ts", async runner => {
try {
const rv = await specimen({ installations })
assertEquals(rv['FOO_FLAGS'], "bar bar bar bar ${FOO_FLAGS} baz${FOO_FLAGS} baz${FOO_FLAGS} baz${FOO_FLAGS} baz") //FIXME lol
assertEquals(rv['PATH'], `/opt/bin:${tmp.join('foo/v2.3.4/bin')}:\${PATH}`)
assertEquals(rv['PATH'], `/opt/bin:${tmp.join('foo/v2.3.4/bin')}\${PATH:+:$PATH}`)
} finally {
stub2.restore()
tmp.rm({recursive: true})
Expand Down
4 changes: 4 additions & 0 deletions src/prefab/construct-env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ export default async function(pkgenv: { installations: Installation[] }) {

for (const key in rv) {
rv[key] = rv[key].replaceAll(new RegExp(`\\$${key}\\b`, 'g'), `\${${key}}`)
// don’t end with a trailing `:` since that is sometimes interpreted as CWD and can break things
// instead of `foo:${PATH}` we end up with `foo${PATH:+:PATH}` which is not POSIX but works
// with all realy shells to avoid the trailing `:`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/realy/really/

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol not even sure what I meant to say. “Really” doesn't make sense

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hm, actually, it's probably real.

rv[key] = rv[key].replaceAll(new RegExp(`:\\$\{${key}}`, 'g'), `\${${key}:+:$${key}}`)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is succinct, but isn't it probably safer to do:

  .replaceAll(/::/, ':')
  .replace(/^:/, '')
  .replace(/:$/, '')

?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, you’re right. This isn’t good enough.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't bother with some of these as we construct this env ourselves. The runtime env from the package.yml could in theory cause a preceding : I guess.

}

return rv
Expand Down