From 4c834e438578a9dba6c80bdc3288fb4f4c904bda Mon Sep 17 00:00:00 2001
From: LecygneNoir <git@lecygnenoir.info>
Date: Wed, 20 Feb 2019 07:30:23 +0100
Subject: [PATCH] Add more escaping char in the good order to avoid breaking
 XML quote for Databases

---
 rollback_database.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rollback_database.sh b/rollback_database.sh
index a2f397b..63a27a9 100755
--- a/rollback_database.sh
+++ b/rollback_database.sh
@@ -51,11 +51,15 @@ for key in $(grep Key ${ORIGINAL_XML}  | awk -F'"' '{print $2}'); do
 
     # Escape special char causing problem in with sed and xml
     msgstr=${msgstr//'\n'/'\\n'}
-    msgstr=${msgstr//'&'/'&amp;'}
+    msgstr=${msgstr//' & '/' &amp; '}
     msgstr=${msgstr//'\"'/"&quot;"}
+    msgstr=${msgstr//'&'/'\&'}
+
     msgid=${msgid//'\n'/'\\n'}
-    msgid=${msgid//'&'/'&amp;'}
+    msgid=${msgid//' & '/' &amp; '}
     msgid=${msgid//'\"'/"&quot;"}
+    msgid=${msgid//'&'/'\&'}
+
 
 
     if [[ "${msgstr}" == "" ]]; then