Skip to content

Commit 69c3787

Browse files
author
Matthew Fisher
committed
Revert "fix(builder): properly escape backticks"
This reverts commit 1610707.
1 parent 68bdeac commit 69c3787

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

builder/image/templates/builder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ if [ ! -f Dockerfile ]; then
113113
BUILD_OPTS+=' deis/slugbuilder'
114114

115115
# build the application and attach to the process
116-
JOB=$(eval '$(parse-string "${BUILD_OPTS[@]}")' )
116+
JOB=$(eval $(parse-string "${BUILD_OPTS[@]}") )
117117
docker attach $JOB
118118

119119
# copy out the compiled slug

tests/config_test.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ var (
1313
configSetCmd = "config:set FOO=讲台 --app={{.AppName}}"
1414
configSet2Cmd = "config:set FOO=10 --app={{.AppName}}"
1515
configSet3Cmd = "config:set POWERED_BY=\"the Deis team\" --app={{.AppName}}"
16-
configSet4Cmd = "config:set CAR='`star' --app={{.AppName}}"
1716
configSetBuildpackCmd = "config:set BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-go#98f37cc --app={{.AppName}}"
1817
configUnsetCmd = "config:unset FOO --app={{.AppName}}"
1918
)
@@ -46,9 +45,6 @@ func configSetup(t *testing.T) *utils.DeisTestConfig {
4645
// ensure envvars with spaces work fine on `git push`
4746
// https://github.com/deis/deis/issues/2477
4847
utils.Execute(t, configSet3Cmd, cfg, false, "the Deis team")
49-
// ensure envvars with backticks work too
50-
// https://github.com/deis/deis/issues/2980
51-
utils.Execute(t, configSet4Cmd, cfg, false, "`star")
5248
// ensure custom buildpack URLS are in order
5349
utils.Execute(t, configSetBuildpackCmd, cfg, false, "https://github.com/heroku/heroku-buildpack-go#98f37cc")
5450
utils.Execute(t, gitPushCmd, cfg, false, "")
@@ -66,13 +62,13 @@ func configListTest(
6662

6763
func configSetTest(t *testing.T, params *utils.DeisTestConfig) {
6864
utils.Execute(t, configSetCmd, params, false, "讲台")
69-
utils.CheckList(t, appsInfoCmd, params, "(v6)", false)
65+
utils.CheckList(t, appsInfoCmd, params, "(v5)", false)
7066
utils.Execute(t, configSet2Cmd, params, false, "10")
71-
utils.CheckList(t, appsInfoCmd, params, "(v7)", false)
67+
utils.CheckList(t, appsInfoCmd, params, "(v6)", false)
7268
}
7369

7470
func configUnsetTest(t *testing.T, params *utils.DeisTestConfig) {
7571
utils.Execute(t, configUnsetCmd, params, false, "")
76-
utils.CheckList(t, appsInfoCmd, params, "(v8)", false)
72+
utils.CheckList(t, appsInfoCmd, params, "(v7)", false)
7773
utils.CheckList(t, "run env --app={{.AppName}}", params, "FOO", true)
7874
}

0 commit comments

Comments
 (0)