Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9ABBF11B7F for ; Mon, 14 Jul 2014 23:54:54 +0000 (UTC) Received: (qmail 40237 invoked by uid 500); 14 Jul 2014 23:54:54 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 40198 invoked by uid 500); 14 Jul 2014 23:54:54 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 40189 invoked by uid 99); 14 Jul 2014 23:54:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Jul 2014 23:54:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2619294B5D3; Mon, 14 Jul 2014 23:54:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mdrob@apache.org To: commits@accumulo.apache.org Message-Id: <5f9ed069282d44fd872748e2c01c8371@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: ACCUMULO-2993 fix division by zero Date: Mon, 14 Jul 2014 23:54:54 +0000 (UTC) Repository: accumulo Updated Branches: refs/heads/master 46f5e8c88 -> e7451ffe9 ACCUMULO-2993 fix division by zero When given a filename, wc will output that filename, resulting in bad division as the shell tries to interpret path separators. Instead, we can have wc read from stdin. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7451ffe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7451ffe Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7451ffe Branch: refs/heads/master Commit: e7451ffe978da9397a8ee6a6a1a6d62f6d379272 Parents: 46f5e8c Author: Mike Drob Authored: Mon Jul 14 18:54:38 2014 -0500 Committer: Mike Drob Committed: Mon Jul 14 18:54:38 2014 -0500 ---------------------------------------------------------------------- assemble/bin/start-server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7451ffe/assemble/bin/start-server.sh ---------------------------------------------------------------------- diff --git a/assemble/bin/start-server.sh b/assemble/bin/start-server.sh index 2a2d96d..2afabb9 100755 --- a/assemble/bin/start-server.sh +++ b/assemble/bin/start-server.sh @@ -40,7 +40,7 @@ SERVICE=$2 LONGNAME=$3 [[ -z $LONGNAME ]] && LONGNAME=$2 -SLAVES=$(wc -l "${ACCUMULO_CONF_DIR}/slaves") +SLAVES=$(wc -l < "${ACCUMULO_CONF_DIR}/slaves") IFCONFIG=/sbin/ifconfig [[ ! -x $IFCONFIG ]] && IFCONFIG='/bin/netstat -ie'