You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/09/15 16:55:24 UTC

[1/2] documentation commit: updated refs/heads/master to 57a65ef

Repository: couchdb-documentation
Updated Branches:
  refs/heads/master a3101e9af -> 57a65effe


Fix bashism in Makefile

The [[ operator is a bashism, and fails with POSIX shells (such as dash),
replace it with a simplier version that does the same thing, without the
unnecessary $(shell) nesting.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/e31ad61f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/e31ad61f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/e31ad61f

Branch: refs/heads/master
Commit: e31ad61f86d97f6005a0cc35347159823e0855a8
Parents: ddf2481
Author: Micah Anderson <mi...@riseup.net>
Authored: Tue Sep 15 10:48:31 2015 -0400
Committer: Micah Anderson <mi...@riseup.net>
Committed: Tue Sep 15 10:49:07 2015 -0400

----------------------------------------------------------------------
 Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/e31ad61f/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index a36345c..03ee668 100644
--- a/Makefile
+++ b/Makefile
@@ -21,11 +21,7 @@ PAPERSIZE    := -D latex_paper_size=a4
 SPHINXFLAGS  := -a -W -n -A local=1 $(PAPERSIZE) -d $(BUILDDIR)/doctree
 SPHINXOPTS   := $(SPHINXFLAGS) $(SOURCE)
 
-ENSURECMD=\
-if [[ $(shell which $(1) > /dev/null 2>&1; echo $$?) -eq 1 ]]; then \
-  echo "*** Make sure that $(1) is installed and on your path" && exit 1; \
-fi
-
+ENSURECMD=which $(1) > /dev/null 2>&1 || (echo "*** Make sure that $(1) is installed and on your path" && exit 1)
 
 all: html pdf info man
 


[2/2] documentation commit: updated refs/heads/master to 57a65ef

Posted by kx...@apache.org.
Merge remote-tracking branch 'github/pr/34'


Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/57a65eff
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/57a65eff
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/57a65eff

Branch: refs/heads/master
Commit: 57a65effe92685f54aa21e2512b5f6590ed08dc0
Parents: a3101e9 e31ad61
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Sep 15 17:53:11 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Sep 15 17:53:11 2015 +0300

----------------------------------------------------------------------
 Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------