[Pkg-privacy-commits] [txtorcon] 08/96: avoid duplication of the install command

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch master
in repository txtorcon.

commit bcad4cc4bd22981aba0676a706232bd6b20bf619
Author: Kali Kaneko <kali at futeisha.org>
Date:   Tue Sep 16 13:59:38 2014 -0500

    avoid duplication of the install command
---
 .gitignore | 2 ++
 Dockerfile | 4 +---
 README.rst | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 94bfb7e..76742a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,9 @@ txtorcon.egg-info/
 *.pyo
 *.pyc
 *.swp
+*.swo
 *~
 announcements/
 annotated_coverage/
 twisted/plugins/dropin.cache
+docs/_build
diff --git a/Dockerfile b/Dockerfile
index e70a518..069754f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,7 @@
 FROM dockerbase-wheezy
 
-## FIXME would be Really Nice Indeed to grok this install list from
-## ONE place. e.g. grep it out of README?
 RUN apt-get update
-RUN apt-get install -y python-setuptools python-twisted python-ipaddr python-geoip graphviz tor
+RUN `awk '/BEGIN_INSTALL/,/END_INSTALL/' README.rst | /bin/grep apt-get | /bin/grep -v development`
 
 ## we make our code available via a "container volume" (-v option to run)
 ## at /txtorcon
diff --git a/README.rst b/README.rst
index 30ab549..7e4a79e 100644
--- a/README.rst
+++ b/README.rst
@@ -139,11 +139,14 @@ dependencies / requirements
    diagrams, if you like) but those tests are skipped if "dot" isn't
    in your path
 
+.. BEGIN_INSTALL
 In any case, on a `Debian <http://www.debian.org/>`_ wheezy, squeeze or
 Ubuntu system, this should work::
 
-    apt-get install python-setuptools python-twisted python-ipaddr python-geoip graphviz
-    apt-get install python-sphinx python-repoze.sphinx.autointerface python-coverage # for develoment
+    apt-get install -y python-setuptools python-twisted python-ipaddr python-geoip graphviz tor
+    apt-get install -y python-sphinx python-repoze.sphinx.autointerface python-coverage # for development
+
+.. END_INSTALL
 
 Using pip this would be::
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/txtorcon.git