diff --git a/.gitignore b/.gitignore index 0d20b6487..63cca906f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,15 @@ *.pyc + +*.xml + +.idea/.name + +*.iml + +*.log + +*.txt + +lbrynet.egg-info/PKG-INFO + +*.egg diff --git a/RUNNING.md b/RUNNING.md index d1b94c808..e2a975236 100644 --- a/RUNNING.md +++ b/RUNNING.md @@ -8,7 +8,7 @@ Download the file https://raw.githubusercontent.com/lbryio/lbry-setup/master/lbr Once it's done building, type: -./lbrycrd/src/lbrycrdd -server -daemon -gen +./lbrycrd/src/lbrycrdd -server -daemon lbrynet-gui @@ -91,12 +91,13 @@ In order to use lbrynet-console or lbrynet-gui, lbyrcrdd must be running. If you ran the easy install script, the lbrycrd folder will be in the directory you ran lbry_setup.sh from. Otherwise it is the root of the cloned lbrycrd repository. Go to that directory. +./src/lbrycrdd -server -daemon + +If you want to mine LBC, also use the flag '-gen', so: + ./src/lbrycrdd -server -daemon -gen It will take a few minutes for your client to download the whole block chain. -Once it has caught up, it will start mining coins. - -If you don't want to mine, leave off the '-gen' flag. lbrycrdd must be running in order for lbrynet to function. @@ -112,19 +113,15 @@ In your terminal: lbrynet-console -You should now be presented with a list of options. +You should be presented with a prompt. Watch It's a Wonderful Life via LBRY -Choose the option labeled Add a stream from a short name by typing the number next to it and pressing the enter key. +Type into the prompt: -You will be prompted for a name. Type in "wonderfullife" and hit enter. After a few seconds, you will prompted to choose what you want to do with the file. Select the option labeled Stream. +get wonderfullife -You will be shown some options related to the file which you do not care about. Type 'n' and hit enter. - -You will be prompted to choose if you really want to download this file. Type 'y' and hit enter. - -To shut it down, type ctrl-c at any time or enter the option to shut down from the main menu. +To shut it down, type ctrl-c at any time or enter 'exit' into the prompt. ### Option 2) Running lbrynet-gui @@ -137,4 +134,4 @@ lbrynet-gui A window should pop up with an entry box. Type 'wonderfullife' into the box, hit go, and then choose to save it or stream it. Enjoy! -Any questions or problems, email jimmy@lbry.io \ No newline at end of file +Any questions or problems, email jimmy@lbry.io diff --git a/setup.py b/setup.py index 32dae8153..03a076268 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ from setuptools import setup, find_packages setup(name='lbrynet', version='0.0.4', packages=find_packages(), - install_requires=['pycrypto', 'twisted', 'miniupnpc', 'yapsy', 'seccure', 'python-bitcoinrpc', 'txJSON-RPC', 'requests', 'unqlite', 'leveldb'], + install_requires=['pycrypto', 'twisted', 'miniupnpc', 'yapsy', 'seccure', 'python-bitcoinrpc==0.1', 'txJSON-RPC', 'requests', 'unqlite', 'leveldb'], entry_points={ 'console_scripts': [ 'lbrynet-console = lbrynet.lbrynet_console.LBRYConsole:launch_lbry_console',