Merge branch 'development'
This commit is contained in:
commit
cfd6ea5a34
2 changed files with 3 additions and 22 deletions
|
@ -4,6 +4,7 @@ import argparse
|
||||||
import requests
|
import requests
|
||||||
import locale
|
import locale
|
||||||
import sys
|
import sys
|
||||||
|
import webbrowser
|
||||||
|
|
||||||
if sys.platform == "darwin":
|
if sys.platform == "darwin":
|
||||||
from appdirs import user_data_dir
|
from appdirs import user_data_dir
|
||||||
|
@ -550,6 +551,8 @@ def launch_lbry_console():
|
||||||
print "If you're running the app, quit before starting lbrynet-console"
|
print "If you're running the app, quit before starting lbrynet-console"
|
||||||
print "If you're running lbrynet-daemon in a terminal, run 'stop-lbrynet-daemon' to turn it off"
|
print "If you're running lbrynet-daemon in a terminal, run 'stop-lbrynet-daemon' to turn it off"
|
||||||
|
|
||||||
|
webbrowser.open("http://localhost:5279")
|
||||||
|
|
||||||
except:
|
except:
|
||||||
log_format = "(%(asctime)s)[%(filename)s:%(lineno)s] %(funcName)s(): %(message)s"
|
log_format = "(%(asctime)s)[%(filename)s:%(lineno)s] %(funcName)s(): %(message)s"
|
||||||
formatter = logging.Formatter(log_format)
|
formatter = logging.Formatter(log_format)
|
||||||
|
|
22
setup_osx.py
22
setup_osx.py
|
@ -1,22 +0,0 @@
|
||||||
import os
|
|
||||||
from setuptools import setup
|
|
||||||
|
|
||||||
APP = [os.path.join('lbrynet', 'lbrynet_daemon', 'Apps', 'LBRYOSXStatusBar.py')]
|
|
||||||
DATA_FILES = []
|
|
||||||
OPTIONS = {
|
|
||||||
'argv_emulation': True,
|
|
||||||
'iconfile': 'app.icns',
|
|
||||||
'plist': {
|
|
||||||
'LSUIElement': True,
|
|
||||||
},
|
|
||||||
'includes': ['rumps']
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
setup(
|
|
||||||
name='LBRY',
|
|
||||||
app=APP,
|
|
||||||
data_files=DATA_FILES,
|
|
||||||
options={'py2app': OPTIONS},
|
|
||||||
setup_requires=['py2app'],
|
|
||||||
)
|
|
Loading…
Add table
Reference in a new issue