Merge pull request #2277 from dokku/josegonzalez-patch-1

Attempt to support strings with double-quotes
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2016-07-30 15:13:39 -04:00
commit f01afb541d
2 files changed
+12 -4

No files matched your search

+1 -1
View File
@@ -27,7 +27,7 @@ build_env_pre_build_buildpack() {
dokku_log_info1 "Adding BUILD_ENV to build environment..." dokku_log_info1 "Adding BUILD_ENV to build environment..."
# create build env files for use in buildpacks like this: # create build env files for use in buildpacks like this:
# https://github.com/niteoweb/heroku-buildpack-buildout/blob/5879fa3418f7d8e079f1aa5816ba1adde73f4948/bin/compile#L34 # https://github.com/niteoweb/heroku-buildpack-buildout/blob/5879fa3418f7d8e079f1aa5816ba1adde73f4948/bin/compile#L34
local id=$(echo $BUILD_ENV |sed -e 's@export @@g' -e 's@\\n@ @g' | docker run "$DOKKU_GLOBAL_RUN_ARGS" -i -a stdin "$IMAGE" /bin/bash -c "for ENV_VAR in $(cat); do echo \$ENV_VAR |sed 's@^\([^=]*\)=\(.*\)\$@echo \\\"\2\\\" >/tmp/env/\1@g' >>/tmp/set_env.sh; done && mkdir -p /tmp/env && /bin/bash /tmp/set_env.sh") local id=$(echo $BUILD_ENV | sed -e 's@export @@g' -e 's@\\n@ @g' | docker run "$DOKKU_GLOBAL_RUN_ARGS" -i -a stdin "$IMAGE" /bin/bash -c "mkdir -p /tmp/env; for ENV_VAR in $(cat); do echo \$ENV_VAR | cut -d'=' -f2- > /tmp/env/\$(echo \$ENV_VAR | cut -d'=' -f1); done " )
test "$(docker wait "$id")" -eq 0 test "$(docker wait "$id")" -eq 0
docker commit "$id" "$IMAGE" > /dev/null docker commit "$id" "$IMAGE" > /dev/null
+11 -3
View File
@@ -17,14 +17,14 @@ teardown() {
} }
@test "(config) config:set --global" { @test "(config) config:set --global" {
run ssh dokku@dokku.me config:set --global test_var=true test_var2=\"hello world\" run ssh dokku@dokku.me config:set --global test_var=true test_var2=\"hello world\" test_var3='double\"quotes'
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
} }
@test "(config) config:get --global" { @test "(config) config:get --global" {
run ssh dokku@dokku.me config:set --global test_var=true test_var2=\"hello world\" test_var3=\"with\\nnewline\" run ssh dokku@dokku.me config:set --global test_var=true test_var2=\"hello world\" test_var3=\"with\\nnewline\" test_var4='double\"quotes'
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
@@ -36,6 +36,10 @@ teardown() {
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_output 'with\nnewline' assert_output 'with\nnewline'
run bash -c "dokku config:get --global test_var4 | grep 'double\"quotes'"
echo "output: "$output
echo "status: "$status
assert_output 'double"quotes'
} }
@test "(config) config:unset --global" { @test "(config) config:unset --global" {
@@ -58,7 +62,7 @@ teardown() {
} }
@test "(config) config:set/get" { @test "(config) config:set/get" {
run ssh dokku@dokku.me config:set $TEST_APP test_var1=true test_var2=\"hello world\" run ssh dokku@dokku.me config:set $TEST_APP test_var1=true test_var2=\"hello world\" test_var3='double\"quotes'
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
@@ -71,6 +75,10 @@ teardown() {
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_output "hello world" assert_output "hello world"
run bash -c "dokku config:get $TEST_APP test_var3 | grep 'double\"quotes'"
echo "output: "$output
echo "status: "$status
assert_output 'double"quotes'
} }
@test "(config) config:set/get (with --app)" { @test "(config) config:set/get (with --app)" {