Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-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 2FA9910BDA for ; Sun, 7 Jul 2013 16:31:34 +0000 (UTC) Received: (qmail 3342 invoked by uid 500); 7 Jul 2013 16:31:32 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 3175 invoked by uid 500); 7 Jul 2013 16:31:31 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 3103 invoked by uid 99); 7 Jul 2013 16:31:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Jul 2013 16:31:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5BD03883EF4; Sun, 7 Jul 2013 16:31:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Date: Sun, 07 Jul 2013 16:31:26 -0000 Message-Id: <7dbff4d7273c47218a472478f6b88d0c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/4] git commit: updated refs/heads/1744-single-config-file to 3fd7500 Fix a mistake that broke all tests. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1c036226 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1c036226 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1c036226 Branch: refs/heads/1744-single-config-file Commit: 1c0362262b1449b3259786ed25f931efbaa3c544 Parents: 0abdba0 Author: Alexander Shorin Authored: Sun Jul 7 19:25:03 2013 +0400 Committer: Alexander Shorin Committed: Sun Jul 7 19:25:03 2013 +0400 ---------------------------------------------------------------------- bin/couchdb.tpl.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/1c036226/bin/couchdb.tpl.in ---------------------------------------------------------------------- diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in index 9ed927d..bd0e465 100644 --- a/bin/couchdb.tpl.in +++ b/bin/couchdb.tpl.in @@ -144,7 +144,7 @@ _add_config_dir () { _load_config () { _add_config_file "$DEFAULT_CONFIG_FILE" _add_config_dir "$DEFAULT_CONFIG_DIR" - if [test -r "$LOCAL_CONFIG_FILE" ]; then + if [ -r "$LOCAL_CONFIG_FILE" ]; then _add_config_file "$LOCAL_CONFIG_FILE" fi _add_config_dir "$LOCAL_CONFIG_DIR"