From 18c4f61078f3aa5de3812d1d602bfb76b91cd150 Mon Sep 17 00:00:00 2001
From: HelloZeroNet <hello@noloop.me>
Date: Thu, 9 Apr 2015 22:20:33 +0200
Subject: [PATCH] Added ZeroBundle install method for windows, ZeroName site
downloaded on startup, updater fix
---
README.md | 12 +++++++++++-
plugins/Zeroname/SiteManagerPlugin.py | 3 +++
zeronet.py | 2 +-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index eaf56fcf..fb3eb975 100644
--- a/README.md
+++ b/README.md
@@ -54,12 +54,22 @@ Decentralized websites using Bitcoin crypto and the BitTorrent network
### Windows
+* [Download ZeroBundle package](https://github.com/HelloZeroNet/ZeroBundle/releases/download/0.1.0/ZeroBundle-v0.1.0.zip) that includes Python 2.7.9 and all required library
+* Unpack to any directory
+* Run `zeronet.cmd`
+
+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 ZeroMQ](http://zeronet.io/files/windows/pyzmq-14.4.1.win32-py2.7.exe)
* [Install Python Greenlet](http://zeronet.io/files/windows/greenlet-0.4.5.win32-py2.7.exe)
* [Install Python Gevent](http://zeronet.io/files/windows/gevent-1.0.1.win32-py2.7.exe)
* [Install Python MsgPack](http://zeronet.io/files/windows/msgpack-python-0.4.2.win32-py2.7.exe)
-* Execute `start.py`
+* [Download and extract ZeroNet](https://codeload.github.com/HelloZeroNet/ZeroNet/zip/master) to any directory
+* Run `start.py`
### Linux
diff --git a/plugins/Zeroname/SiteManagerPlugin.py b/plugins/Zeroname/SiteManagerPlugin.py
index 806d9021..1939e928 100644
--- a/plugins/Zeroname/SiteManagerPlugin.py
+++ b/plugins/Zeroname/SiteManagerPlugin.py
@@ -13,6 +13,9 @@ log = logging.getLogger("ZeronamePlugin")
class SiteManagerPlugin(object):
zeroname_address = "1Name2NXVi1RDPDgf5617UoW7xA6YrhM9F"
site_zeroname = None
+ def load(self):
+ super(SiteManagerPlugin, self).load()
+ self.need(self.zeroname_address) # Need ZeroName site
# Checks if its a valid address
def isAddress(self, address):
diff --git a/zeronet.py b/zeronet.py
index 62084b2c..a610424c 100644
--- a/zeronet.py
+++ b/zeronet.py
@@ -13,7 +13,7 @@ def main():
update.update()
# Close log files
- logger = sys.modules["src.main"].logging.getLogger()
+ logger = sys.modules["main"].logging.getLogger()
for handler in logger.handlers[:]:
handler.flush()