[Pkg-mailman-hackers] Pkg-mailman commit - rev 508 - trunk/debian
Thijs Kinkhorst
thijs at alioth.debian.org
Thu Aug 2 12:07:13 UTC 2007
Author: thijs
Date: 2007-08-02 12:07:13 +0000 (Thu, 02 Aug 2007)
New Revision: 508
Modified:
trunk/debian/changelog
trunk/debian/config
trunk/debian/postinst
trunk/debian/postrm
Log:
* Fix some bashisms in Debian packaging scripts.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-08-02 10:27:13 UTC (rev 507)
+++ trunk/debian/changelog 2007-08-02 12:07:13 UTC (rev 508)
@@ -3,8 +3,9 @@
* Drop suggests for obsolete python-*-codecs and drop versioned
dependencies for pre-oldstable versions.
* Fix formatting of man pages (Closes: #432848).
+ * Fix some bashisms in Debian packaging scripts.
- -- Thijs Kinkhorst <thijs at debian.org> Sat, 14 Jul 2007 18:34:11 +0200
+ -- Thijs Kinkhorst <thijs at debian.org> Thu, 02 Aug 2007 14:08:03 +0200
mailman (1:2.1.9-8) unstable; urgency=low
Modified: trunk/debian/config
===================================================================
--- trunk/debian/config 2007-08-02 10:27:13 UTC (rev 507)
+++ trunk/debian/config 2007-08-02 12:07:13 UTC (rev 508)
@@ -51,7 +51,7 @@
db_fset mailman/used_languages scanned false
else
if [ "${scanned}" != "true" ] ; then
- echo -n "Looking for enabled languages (this may take some time) ..."
+ printf "Looking for enabled languages (this may take some time) ..."
unset used_languages
for l in $(get_used_languages); do
used_languages=${used_languages:+${used_languages} }$l
@@ -59,7 +59,7 @@
db_set mailman/used_languages "${used_languages}"
db_fset mailman/used_languages scanned true
db_fset mailman/used_languages seen false
- echo " done."
+ printf " done.\n"
fi
# Install only languages selected by the administrator
# forcing used languages to be always available.
Modified: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst 2007-08-02 10:27:13 UTC (rev 507)
+++ trunk/debian/postinst 2007-08-02 12:07:13 UTC (rev 508)
@@ -60,8 +60,8 @@
leftover=/etc/mailman/leftover
: >${leftover}
for lang in ${old_languages}; do
- if echo " ${site_languages} " | grep -v -q " ${lang} " ; then
- echo -n "Removing unmodified files from ${mm_etc}/${lang} " >&2
+ if echo " ${site_languages} " | grep -v -q " ${lang} " ; then
+ printf "Removing unmodified files from ${mm_etc}/${lang} " >&2
# UGLY HACK: Since ucf doesn't support conditional removal
# we access its hashfile directly
md5sums=$(tempfile --prefix=mm_${lang})
@@ -74,32 +74,32 @@
for file in $(${md5sum} -c ${md5sums} 2>&1 | sed -n 's/:\? *OK$//p'); do
ucf --debconf-ok --purge ${file}
rm -f ${file} ${file}.dpkg-dist
- echo -n . >&2
+ printf . >&2
done
# For modified files remove corresponding .dpkg-dist
for file in $(grep "^[[:xdigit:]]{32}[[:space:]]\+${mm_etc}/$lang/" /var/lib/ucf/hashfile | awk '{ print $2 }'); do
rm -f ${file}.dpkg-dist
- echo -n . >&2
+ printf . >&2
done
- echo " done." >&2
+ printf " done.\n" >&2
rmdir ${mm_etc}/${lang} 2>/dev/null \
- || echo "Directory ${mm_etc}/${lang} not empty, not removed." >&2
+ || printf "Directory ${mm_etc}/${lang} not empty, not removed.\n" >&2
rm -f ${md5sums}
fi
done
for lang in ${site_languages}; do
- echo -n "Installing site language ${lang} " >&2
+ printf "Installing site language ${lang} " >&2
mkdir -p ${mm_etc}/${lang}
for file in $(ls ${mm_dist}/${lang}); do
- echo -n . >&2
+ printf . >&2
langfile=${lang}/${file}
ucf --debconf-ok --three-way ${mm_dist}/${langfile} ${mm_etc}/${langfile} 2>/dev/null
# Upon install ucf leaves a duplicate in .dpkg-dist (Bug #238730), remove it
cmp -s ${mm_etc}/${langfile} ${mm_etc}/${langfile}.dpkg-dist \
&& rm ${mm_etc}/${langfile}.dpkg-dist
done
- echo " done." >&2
+ printf " done.\n" >&2
done
# Done with site language stuff
@@ -177,14 +177,14 @@
DOMAIN=localhost.localdomain
fi
if [ ! -e /etc/$PACKAGE/mm_cfg.py ]; then
- echo "Configuring $PACKAGE for domain $DOMAIN ..."
+ printf "Configuring $PACKAGE for domain $DOMAIN ...\n"
sed s/thunderchild.aszi.sztaki.hu/$DOMAIN/g /usr/lib/mailman/Mailman/mm_cfg.py.dist \
> /etc/$PACKAGE/mm_cfg.py
fi
if grep -q mm_defaults /etc/mailman/mm_cfg.py; then
- echo "Changing mm_defaults to Defaults in mm_cfg.py"
- echo "Fixing host name in /etc/mm_cfg.py"
+ printf "Changing mm_defaults to Defaults in mm_cfg.py\n"
+ printf "Fixing host name in /etc/mm_cfg.py\n"
sed s/mm_defaults/Defaults/ "s/'localhost'/$DOMAIN/g" "s#http://localhost#http://$DOMAIN#g" </etc/mailman/mm_cfg.py >/etc/mailman/mm_cfg.py.new
mv /etc/mailman/mm_cfg.py /etc/mailman/mm_cfg.py.old
mv /etc/mailman/mm_cfg.py.new /etc/mailman/mm_cfg.py
@@ -198,7 +198,7 @@
;;
*)
- echo "postinst called with unknown argument \`$1'" >&2
+ printf "postinst called with unknown argument \`$1'\n" >&2
exit 1
;;
esac
Modified: trunk/debian/postrm
===================================================================
--- trunk/debian/postrm 2007-08-02 10:27:13 UTC (rev 507)
+++ trunk/debian/postrm 2007-08-02 12:07:13 UTC (rev 508)
@@ -8,13 +8,13 @@
# HACK: At present there is no way to ask ucf for registered files
# except for directly querying its database.
if which ucf >/dev/null; then
- echo -n "Purging files from ucf database " >&2
+ printf "Purging files from ucf database " >&2
for file in $(sed -e '\|^[0-9a-fA-F]\+[[:space:]]\+/etc/mailman/|!d' -e 's|^[0-9a-fA-F]\+[[:space:]]\+||' /var/lib/ucf/hashfile); do
ucf --purge ${file} 2>/dev/null
- echo -n . >&2
+ printf . >&2
done
ucf --purge /etc/cron.d/mailman 2>/dev/null
- echo ". done." >&2
+ printf ". done.\n" >&2
fi
fi
More information about the Pkg-mailman-hackers
mailing list