From 178d4f20ca0e0bdf4ada57a67f28670d63a53aa2 Mon Sep 17 00:00:00 2001 From: ZeroNet Date: Sun, 6 Mar 2016 02:34:24 +0100 Subject: [PATCH] New ZeroBundle for Mac and Linux, fix Docker part --- README.md | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index f42f3035..07095ea1 100644 --- a/README.md +++ b/README.md @@ -70,18 +70,16 @@ Decentralized websites using Bitcoin crypto and the BitTorrent network - https:/ It downloads the latest version of ZeroNet then starts it automatically. -#### Alternative method for Windows by installing Python - -* [Install Python 2.7](https://www.python.org/ftp/python/2.7.9/python-2.7.9.msi) -* [Install Python Greenlet](https://zeronet.io/files/windows/greenlet-0.4.5.win32-py2.7.exe) -* [Install Python Gevent](https://zeronet.io/files/windows/gevent-1.0.1.win32-py2.7.exe) -* [Install Python MsgPack](https://zeronet.io/files/windows/msgpack-python-0.4.2.win32-py2.7.exe) -* [Download and extract ZeroNet](https://codeload.github.com/HelloZeroNet/ZeroNet/zip/master) to any directory -* Run `start.py` - ### Linux -#### Debian +* `wget https://github.com/HelloZeroNet/ZeroBundle/releases/download/0.1.1/ZeroBundle-linux64-v0.1.1.tar.gz` +* `tar xvpfz ZeroBundle-linux64-v0.1.1.tar.gz` +* `cd ZeroBundle` +* Start with `./ZeroNet.sh` + +It downloads the latest version of ZeroNet then starts it automatically. + +#### Manual install for Debian Linux * `sudo apt-get update` * `sudo apt-get install msgpack-python python-gevent` @@ -89,20 +87,16 @@ It downloads the latest version of ZeroNet then starts it automatically. * `tar xvpfz master.tar.gz` * `cd ZeroNet-master` * Start with `python zeronet.py` -* Open http://127.0.0.1:43110/ in your browser and enjoy! :) - -#### Other Linux or without root access -* Check your python version using `python --version`. if the returned version is not `Python 2.7.X` then try `python2` or `python2.7` command and use it from now on -* `wget https://bootstrap.pypa.io/get-pip.py` -* `python get-pip.py --user gevent msgpack-python` -* Start with `python zeronet.py` +* Open http://127.0.0.1:43110/ in your browser ### Mac - * Install [Homebrew](http://brew.sh/) - * `brew install python` - * `pip install gevent msgpack-python` - * [Download](https://github.com/HelloZeroNet/ZeroNet/archive/master.zip), Unpack, run `python zeronet.py` +* [Download ZeroBundle package](https://github.com/HelloZeroNet/ZeroBundle/releases/download/0.1.1/ZeroBundle-mac-v0.1.1.zip) that includes Python 2.7.11 and all required libraries +* Unpack +* Run `ZeroNet(.app)` + +It downloads the latest version of ZeroNet then starts it automatically. + ### [Vagrant](https://www.vagrantup.com/) @@ -112,13 +106,8 @@ It downloads the latest version of ZeroNet then starts it automatically. * Run `python zeronet.py --ui_ip 0.0.0.0` * Open http://127.0.0.1:43110/ in your browser -<<<<<<< HEAD ### [Docker](https://www.docker.com/) -* `docker run -p 15441:15441 -p 43110:43110 nofish/zeronet` -======= -### Docker * `docker run -d -v :/root/data -p 15441:15441 -p 43110:43110 nofish/zeronet` ->>>>>>> upstream/master * Open http://127.0.0.1:43110/ in your browser ### [Virtualenv](https://virtualenv.readthedocs.org/en/latest/) @@ -182,7 +171,7 @@ Site:13DNDk..bhC2 Successfuly published to 3 peers * That's it! You've successfully signed and published your modifications. -## Donate +## Help keep this project alive - Bitcoin: 1QDhxQ6PraUZa21ET5fYUCPgdrwBomnFgX - Paypal: https://zeronet.readthedocs.org/en/latest/help_zeronet/donate/