diff --git a/sympa/recipe/sympa_fix_personalization.recipe b/sympa/recipe/sympa_fix_personalization.recipe index 2c36caf..edb734d 100644 --- a/sympa/recipe/sympa_fix_personalization.recipe +++ b/sympa/recipe/sympa_fix_personalization.recipe @@ -13,7 +13,7 @@ function fix_personalization { if ! grep -q "^personalization_feature.*\*$" $GLOBAL_CONF; then /opt/miaou-bash/tools/append_or_replace '^personalization_feature.*$' 'personalization_feature on' $GLOBAL_CONF /opt/miaou-bash/tools/append_or_replace '^personalization.mail_apply_on.*$' 'personalization.mail_apply_on footer' $GLOBAL_CONF - echo 'personalization now enabled' + echo 'enabling personalization now' FOUND=true else echo 'personalization already enabled globally!' @@ -29,7 +29,7 @@ function patch_message_pm { else echo 'already patched!' fi - message=$(prepend_2lines_of_text_before_existing_line "$MESSAGE_PM" '$data->{sender} = $self->{sender};' '$data->{gecos} = $self->{gecos};' '$data->{subject} = $self->{decoded_subject};') + message=$(prepend_2lines_of_text_before_existing_line "$MESSAGE_PM" '$data->{sender} = $self->{sender};' '$data->{gecos} = $self->{gecos};' '$data->{subject} = $self->{decoded_subject};') if [[ $message =~ 'do prepend' ]]; then echo 'prepending sender and gecos in message pm' FOUND=true @@ -52,6 +52,9 @@ function prepend_2lines_of_text_before_existing_line { if ! (grep "^$existing$" $file -B2 | grep -qz "$line1.*$line2.*$existing"); then echo 'do prepend' + echo -e "line1=$line1" + echo -e "line2=$line2" + echo -e "existing=$existing" sed -i "/^$existing$/s/^/$line1\n$line2\n/" $file else echo 'already done!'