[25800] in Source-Commits
/svn/athena r25238 - trunk/debathena/scripts/installer
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Jul 14 18:20:09 2011
Date: Thu, 14 Jul 2011 18:20:02 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107142220.p6EMK2Sf000553@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-14 18:20:02 -0400 (Thu, 14 Jul 2011)
New Revision: 25238
Modified:
trunk/debathena/scripts/installer/install-debathena.beta.sh
Log:
Use grep -Fqx instead of sed, since something is screwing with newlines
Modified: trunk/debathena/scripts/installer/install-debathena.beta.sh
===================================================================
--- trunk/debathena/scripts/installer/install-debathena.beta.sh 2011-07-14 22:06:08 UTC (rev 25237)
+++ trunk/debathena/scripts/installer/install-debathena.beta.sh 2011-07-14 22:20:02 UTC (rev 25238)
@@ -257,12 +257,11 @@
# include known repositories but make no assumptions about wanting
# others. (For instances, "development" does @i{not} automatically
# infer "proposed".)
-hescluster=$(dig +short +bufsize=2048 ${hostname}.cluster.ns.athena.mit.edu TXT \
- |sed -e 's/"$//' -ne 's/^"apt_release //p') || hescluster=""
+hescluster=$(dig +short +bufsize=2048 ${hostname}.cluster.ns.athena.mit.edu TXT) || hescluster=""
aptexplained=false
for hc in proposed development bleeding; do
- if echo " $hescluster " | grep -q " $hc "; then
+ if echo "$hescluster" | grep -Fxq "\"apt_release $hc\""; then
echo "Adding $distro-$hc apt repository."
if [ "${aptexplained}" = false ] ; then
echo "" >> $clustersourceslist
