From 4c6206b270122746327e6803bf306c76abcb2ec1 Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Tue, 7 Dec 2010 08:49:08 -0500
Subject: [PATCH] Fixing bashism in popcon post-scripts -- no "+=" operator

---
 debian/changelog                               |  6 ++++++
 debian/neurodebian-popularity-contest.postinst | 13 ++++++++++---
 debian/neurodebian-popularity-contest.postrm   |  3 ++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b45714..4f0e472 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+neurodebian (0.21) unstable; urgency=low
+
+  * Fixing bashism in popcon post-scripts -- no "+=" operator
+
+ -- Yaroslav Halchenko <debian@onerussian.com>  Tue, 07 Dec 2010 08:48:53 -0500
+
 neurodebian (0.20) unstable; urgency=low
 
   * New package neurodebian-popularity-contest, which all backported
diff --git a/debian/neurodebian-popularity-contest.postinst b/debian/neurodebian-popularity-contest.postinst
index 4ab5081..3bb1437 100755
--- a/debian/neurodebian-popularity-contest.postinst
+++ b/debian/neurodebian-popularity-contest.postinst
@@ -3,9 +3,16 @@
 popcon_conf=/etc/popularity-contest.conf
 if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then
 	# Adjust popularity-contest.conf
-	if [ -e "$popcon_conf" ] && ! grep -q 'SUBMITURLS.*neuro.debian.net' "$popcon_conf"; then
-		echo "Adding NeuroDebian url for Popularity Contest submissions."
-		echo -e 'SUBMITURLS+=" http://neuro.debian.net/cgi-bin/popcon-submit.cgi"' >> "$popcon_conf"
+	if [ -e "$popcon_conf" ]; then
+		# Fix dashism missing += operator
+		if grep -q 'SUBMITURLS+="' "$popcon_conf"; then
+			echo "Adjusting addition of new entries in $popcon_conf for dash."
+			sed -i -e 's,SUBMITURLS+=",SUBMITURLS="$SUBMITURLS,g' "$popcon_conf"
+		fi
+		if ! grep -q 'SUBMITURLS.*neuro.debian.net' "$popcon_conf"; then
+			echo "Adding NeuroDebian url for Popularity Contest submissions."
+			echo -e 'SUBMITURLS="$SUBMITURLS http://neuro.debian.net/cgi-bin/popcon-submit.cgi"' >> "$popcon_conf"
+		fi
 	fi
 fi
 
diff --git a/debian/neurodebian-popularity-contest.postrm b/debian/neurodebian-popularity-contest.postrm
index b392f7b..6615555 100755
--- a/debian/neurodebian-popularity-contest.postrm
+++ b/debian/neurodebian-popularity-contest.postrm
@@ -10,7 +10,8 @@ if [ "$1" = "purge" ]; then
 		echo "Removing NeuroDebian url for Popularity Contest submissions."
 		# First remove any explicit mentioning and then empty additions
 		sed -i -e 's,http://neuro.debian.net/cgi-bin/popcon-submit.cgi,,g' \
-			   -e '/SUBMITURLS+=" *"/d'\
+			   -e '/SUBMITURLS+=" *"/d' \
+			   -e '/SUBMITURLS="$SUBMITURLS *"/d' \
 			"$popcon_conf"
 	fi
 fi
-- 
2.39.2