From d8fa38010aae48c50ea9f23b7f2580453427dbc2 Mon Sep 17 00:00:00 2001
From: Michael Kuron <m.kuron@gmx.de>
Date: Fri, 16 Jun 2017 14:02:12 +0200
Subject: [PATCH] SOGo Integrator bugfix for multiple domains

---
 data/web/thunderbird-plugins/.gitignore       | 2 +-
 data/web/thunderbird-plugins/build-plugins.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 data/web/thunderbird-plugins/build-plugins.sh

diff --git a/data/web/thunderbird-plugins/.gitignore b/data/web/thunderbird-plugins/.gitignore
index 6f8d20b0..9146c321 100644
--- a/data/web/thunderbird-plugins/.gitignore
+++ b/data/web/thunderbird-plugins/.gitignore
@@ -1,4 +1,4 @@
 *.zip
 sogo-*-master
 version.csv
-*.xpi
\ No newline at end of file
+*.xpi
diff --git a/data/web/thunderbird-plugins/build-plugins.sh b/data/web/thunderbird-plugins/build-plugins.sh
old mode 100644
new mode 100755
index 85826ad7..820bf6e6
--- a/data/web/thunderbird-plugins/build-plugins.sh
+++ b/data/web/thunderbird-plugins/build-plugins.sh
@@ -26,7 +26,7 @@ while read DOMAIN; do
 	sed -i 's/<\/Seq>/<li><Description em:id="sieve@mozdev.org" em:name="Sieve"\/><\/li><li><Description em:id="imap-acl@sirphreak.com" em:name="Imap-ACL-Extension"\/><\/li><\/Seq>/g' custom/${DOMAIN}/chrome/content/extensions.rdf
 	make build=${DOMAIN}
 	INTEGRATOR_VER=$(grep em:version install.rdf | awk -F '"' '{print $2}')
-	cp sogo-integrator*.xpi ../sogo-integrator-${INTEGRATOR_VER}-${DOMAIN}.xpi
+	cp sogo-integrator-*-${DOMAIN}.xpi ../sogo-integrator-${INTEGRATOR_VER}-${DOMAIN}.xpi
 	cd ..
 done
 
@@ -34,7 +34,7 @@ done
 cd connector
 make
 CONNECTOR_VER=$(grep em:version install.rdf | awk -F '"' '{print $2}')
-cp sogo-connector*.xpi ../sogo-connector-${CONNECTOR_VER}.xpi
+cp sogo-connector-*.xpi ../sogo-connector-${CONNECTOR_VER}.xpi
 cd ..
 
 # download Sieve plugin