From bca5d8a6c53d00fa51044becd9125dcacc4382b5 Mon Sep 17 00:00:00 2001
From: shortcutme <tamas@zeronet.io>
Date: Tue, 27 Feb 2018 02:48:15 +0100
Subject: [PATCH] Use msgpack pip package everywhere

---
 Dockerfile                         | 2 +-
 README-ru.md                       | 2 +-
 README-zh-cn.md                    | 2 +-
 Vagrantfile                        | 2 +-
 src/Connection/ConnectionServer.py | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b0695b47..bbfa08a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV HOME /root
 #Install ZeroNet
 RUN apk --update upgrade \
   && apk --no-cache --no-progress add musl-dev gcc python python-dev py2-pip tor \
-  && pip install gevent msgpack-python \
+  && pip install gevent msgpack \
   && apk del musl-dev gcc python-dev py2-pip \
   && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* \
   && echo "ControlPort 9051" >> /etc/tor/torrc \
diff --git a/README-ru.md b/README-ru.md
index ba5add9b..69c1c5b9 100644
--- a/README-ru.md
+++ b/README-ru.md
@@ -138,7 +138,7 @@ article](https://wiki.archlinux.org/index.php/ZeroNet) для дальнейше
 
 * `virtualenv env`
 * `source env/bin/activate`
-* `pip install msgpack-python gevent`
+* `pip install msgpack gevent`
 * `python2 zeronet.py`
 * Откройте http://127.0.0.1:43110/ в вашем браузере.
 
diff --git a/README-zh-cn.md b/README-zh-cn.md
index e7f142b7..bae145c8 100644
--- a/README-zh-cn.md
+++ b/README-zh-cn.md
@@ -112,7 +112,7 @@
 
 * `virtualenv env`
 * `source env/bin/activate`
-* `pip install msgpack-python gevent`
+* `pip install msgpack gevent`
 * `python2 zeronet.py`
 * 在你的浏览器中打开 http://127.0.0.1:43110/
 
diff --git a/Vagrantfile b/Vagrantfile
index 6c4da894..24fe0c45 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -40,6 +40,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision "shell",
       inline: "sudo apt-get install msgpack-python python-gevent python-pip python-dev -y"
   config.vm.provision "shell",
-      inline: "sudo pip install msgpack-python --upgrade"
+      inline: "sudo pip install msgpack --upgrade"
 
 end
diff --git a/src/Connection/ConnectionServer.py b/src/Connection/ConnectionServer.py
index e27ccaef..2664ba6a 100644
--- a/src/Connection/ConnectionServer.py
+++ b/src/Connection/ConnectionServer.py
@@ -56,7 +56,7 @@ class ConnectionServer(object):
         # Check msgpack version
         if msgpack.version[0] == 0 and msgpack.version[1] < 4:
             self.log.error(
-                "Error: Unsupported msgpack version: %s (<0.4.0), please run `sudo apt-get install python-pip; sudo pip install msgpack-python --upgrade`" %
+                "Error: Unsupported msgpack version: %s (<0.4.0), please run `sudo apt-get install python-pip; sudo pip install msgpack --upgrade`" %
                 str(msgpack.version)
             )
             sys.exit(0)