diff mbox

scripts/config: allow setting a string which value contains a colon

Message ID 1384689334-6979-1-git-send-email-chauplac@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Clement Chauplannaz Nov. 17, 2013, 11:55 a.m. UTC
A bug in script `config' prevented from modifying an existing variable's
value to a string that contains a colon ':'.  The reason behind it is that
colons are used as a separator in `sed' commands that script `config'
relies on.

Escape colons in `sed' commands to allow values containing colons.

Signed-off-by: Clement Chauplannaz <chauplac@gmail.com>
---
 scripts/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Yann E. MORIN Nov. 18, 2013, 6:06 p.m. UTC | #1
Clément, All,

On 2013-11-17 12:55 +0100, Clement Chauplannaz spake thusly:
> A bug in script `config' prevented from modifying an existing variable's
> value to a string that contains a colon ':'.  The reason behind it is that
> colons are used as a separator in `sed' commands that script `config'
> relies on.
> 
> Escape colons in `sed' commands to allow values containing colons.
> 
> Signed-off-by: Clement Chauplannaz <chauplac@gmail.com>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

It'll be in my tree soon, as a rc-fix. Thank you.

Regards,
Yann E. MORIN.

> ---
>  scripts/config | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/config b/scripts/config
> index 6804179..4b16260 100755
> --- a/scripts/config
> +++ b/scripts/config
> @@ -78,7 +78,7 @@ txt_append() {
>  
>  txt_subst() {
>  	local before="$1"
> -	local after="$2"
> +	local after="${2//:/\:}"
>  	local infile="$3"
>  	local tmpfile="$infile.swp"
>  
> -- 
> 1.8.3.2.dirty
>
diff mbox

Patch

diff --git a/scripts/config b/scripts/config
index 6804179..4b16260 100755
--- a/scripts/config
+++ b/scripts/config
@@ -78,7 +78,7 @@  txt_append() {
 
 txt_subst() {
 	local before="$1"
-	local after="$2"
+	local after="${2//:/\:}"
 	local infile="$3"
 	local tmpfile="$infile.swp"