Mercurial > public > mercurial-scm > hg-stable

diff contrib/dockerrpm @ 21642:76a347bcdb33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docker: check for docker.io first
author Matt Mackall <mpm@selenic.com>
date Thu, 29 May 2014 16:01:39 -0700
parents f1bcc33a5c52
children f5abb231b80a
line wrap: on
line diff
--- a/contrib/dockerrpm	Tue May 20 04:07:58 2014 +0200
+++ b/contrib/dockerrpm	Thu May 29 16:01:39 2014 -0700
@@ -3,10 +3,10 @@
 BUILDDIR=$(dirname $0)
 ROOTDIR=$(cd $BUILDDIR/..; pwd)
 
-if which docker >> /dev/null ; then
+if which docker.io >> /dev/null ; then
+  DOCKER=docker.io
+elif which docker >> /dev/null ; then
   DOCKER=docker
-elif which docker.io >> /dev/null ; then
-  DOCKER=docker.io
 fi
 
 $DOCKER build --tag "hg-dockerrpm-$1" - < $BUILDDIR/docker/$1