From 9b4cff8cd60c0d8e4d046ff1c05ccff2db0d0a44 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Thu, 18 Jun 2015 13:55:32 +0000
Subject: [PATCH] bootstrap: _rpm_common.sh, centos fixes

---
 bootstrap/_rpm_common.sh | 20 ++++++++++++++++++++
 bootstrap/centos.sh      | 20 +-------------------
 bootstrap/fedora.sh      | 19 +------------------
 docs/using.rst           | 18 +++++++++++-------
 4 files changed, 33 insertions(+), 44 deletions(-)
 create mode 100755 bootstrap/_rpm_common.sh
 mode change 100644 => 120000 bootstrap/centos.sh
 mode change 100755 => 120000 bootstrap/fedora.sh

diff --git a/bootstrap/_rpm_common.sh b/bootstrap/_rpm_common.sh
new file mode 100755
index 000000000..1209cd44a
--- /dev/null
+++ b/bootstrap/_rpm_common.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Tested with:
+#   - Fedora 22 (x64)
+#   - Centos 7 (x64: on AWS EC2 t2.micro, DigitalOcean droplet)
+
+# "git-core" seems to be an alias for "git" in CentOS 7 (yum search fails)
+yum install -y \
+  git-core \
+  python \
+  python-devel \
+  python-virtualenv \
+  python-devel \
+  gcc \
+  swig \
+  dialog \
+  augeas-libs \
+  openssl-devel \
+  libffi-devel \
+  ca-certificates \
diff --git a/bootstrap/centos.sh b/bootstrap/centos.sh
deleted file mode 100644
index 318a47a8a..000000000
--- a/bootstrap/centos.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# Tested with: Centos 7 on AWS EC2 t2.micro (x64)
-
-yum install -y \
-  git \
-  python \
-  python-devel \
-  python-virtualenv \
-  python-devel \
-  gcc \
-  swig \
-  dialog \
-  augeas-libs \
-  openssl-devel \
-  libffi-devel \
-  ca-certificates \
-  python-setuptools \
-  readline-devel
diff --git a/bootstrap/centos.sh b/bootstrap/centos.sh
new file mode 120000
index 000000000..a0db46d70
--- /dev/null
+++ b/bootstrap/centos.sh
@@ -0,0 +1 @@
+_rpm_common.sh
\ No newline at end of file
diff --git a/bootstrap/fedora.sh b/bootstrap/fedora.sh
deleted file mode 100755
index 97ea1e637..000000000
--- a/bootstrap/fedora.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# Tested with:
-#   - Fedora 22 (x64)
-
-yum install -y \
-  git-core \
-  python \
-  python-devel \
-  python-virtualenv \
-  python-devel \
-  gcc \
-  swig \
-  dialog \
-  augeas-libs \
-  openssl-devel \
-  libffi-devel \
-  ca-certificates \
diff --git a/bootstrap/fedora.sh b/bootstrap/fedora.sh
new file mode 120000
index 000000000..a0db46d70
--- /dev/null
+++ b/bootstrap/fedora.sh
@@ -0,0 +1 @@
+_rpm_common.sh
\ No newline at end of file
diff --git a/docs/using.rst b/docs/using.rst
index 0e0b493ca..ef64452e1 100644
--- a/docs/using.rst
+++ b/docs/using.rst
@@ -70,12 +70,23 @@ Mac OSX
 
    sudo ./bootstrap/mac.sh
 
+
 Centos 7
 --------
+
 .. code-block:: shell
 
    sudo ./bootstrap/centos.sh
 
+For installation run this modified command (note the trailing
+backslash):
+
+.. code-block:: shell
+
+   SWIG_FEATURES="-includeall -D__`uname -m`__-I/usr/include/openssl" \
+   ./venv/bin/pip install -r requirements.txt functools32
+
+
 Installation
 ============
 
@@ -84,13 +95,6 @@ Installation
    virtualenv --no-site-packages -p python2 venv
    ./venv/bin/pip install -r requirements.txt
 
-Installation on Centos 7
-============
-
-.. code-block:: shell
-
-   virtualenv --no-site-packages -p python2 venv
-   env SWIG_FEATURES="-cpperraswarn -includeall -D__`uname -m`__ -I/usr/include/openssl" ./venv/bin/python setup.py install
 
 Usage
 =====