Commit6f34cbf

authored

fix: Use double quotes fortrap signal (#2956)

Frequently callers will wrap our shell script in `sh -c ''`.Having single quotes on our `trap` led to a syntax error whendoing this.

1 parent8b76e40 commit6f34cbfCopy full SHA for 6f34cbf

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/usr/bin/env sh`
`2`	`2`	`set -eux pipefail`
`3`		`-trap'echo === Agent script exited with non-zero code. Sleeping 24h to preserve logs... && sleep 86400' EXIT`
	`3`	`+trap"echo === Agent script exited with non-zero code. Sleeping 24h to preserve logs... && sleep 86400" EXIT`
`4`	`4`	`BINARY_DIR=$(mktemp -d -t coder.XXXXXX)`
`5`	`5`	`BINARY_NAME=coder`
`6`	`6`	`cd"$BINARY_DIR"`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`#!/usr/bin/env sh`
`2`	`2`	`set -eux pipefail`
`3`		`-# Not all instances of "trap" support ERR SIGNAL_SPEC. See: https://github.com/bmizerany/roundup/issues/25`
`4`		`-trap'echo === Agent script exited with non-zero code. Sleeping 24h to preserve logs... && sleep 86400' EXIT\|\|true`
	`3`	`+trap"echo === Agent script exited with non-zero code. Sleeping 24h to preserve logs... && sleep 86400" EXIT`
`5`	`4`	`BINARY_DIR=$(mktemp -d -t coder.XXXXXX)`
`6`	`5`	`BINARY_NAME=coder`
`7`	`6`	`BINARY_URL=${ACCESS_URL}bin/coder-linux-${ARCH}`

Comments

(0)