From b6c4a750deb381b58761d0be04ea82f091788760 Mon Sep 17 00:00:00 2001 From: Arthur Schreiber Date: Fri, 18 Sep 2015 15:32:33 +0200 Subject: [PATCH 1/2] Support removing config variables that contain `\n`. --- plugins/config/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/config/functions b/plugins/config/functions index 6dca410bb..eeb0db2f9 100644 --- a/plugins/config/functions +++ b/plugins/config/functions @@ -211,7 +211,7 @@ config_unset() { for var in $VARS; do dokku_log_info1 "Unsetting $var" - ENV_TEMP=$(echo -e "${ENV_TEMP}" | sed "/^export $var=/ d") + ENV_TEMP=$(echo "${ENV_TEMP}" | sed "/^export $var=/ d") config_write "$ENV_TEMP" done From 7a0161dd866a66fe7cdcbb1328447a966d20fb11 Mon Sep 17 00:00:00 2001 From: Arthur Schreiber Date: Fri, 18 Sep 2015 15:34:46 +0200 Subject: [PATCH 2/2] Add a testcase. --- tests/unit/config.bats | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/unit/config.bats b/tests/unit/config.bats index 10e1239d9..d32131403 100644 --- a/tests/unit/config.bats +++ b/tests/unit/config.bats @@ -77,7 +77,7 @@ teardown() { } @test "(config) config:unset" { - run ssh dokku@dokku.me config:set $TEST_APP test_var=true test_var2=\"hello world\" + run ssh dokku@dokku.me config:set $TEST_APP test_var=true test_var2=\"hello world\" test_var3=\"with\\nnewline\" echo "output: "$output echo "status: "$status assert_success @@ -93,6 +93,10 @@ teardown() { echo "output: "$output echo "status: "$status assert_output "" + run dokku config:get $TEST_APP test_var3 + echo "output: "$output + echo "status: "$status + assert_output 'with\nnewline' } @test "(config) global config (herokuish)" {