Merge branch 'master' of git://gitorious.org/electrum/electrum
This commit is contained in:
commit
69ca6a3074
|
@ -5,4 +5,5 @@ exclude setup.py
|
||||||
recursive-include ecdsa *.py
|
recursive-include ecdsa *.py
|
||||||
recursive-include aes *.py
|
recursive-include aes *.py
|
||||||
include icons.qrc
|
include icons.qrc
|
||||||
|
include remote.php
|
||||||
recursive-include icons *
|
recursive-include icons *
|
||||||
|
|
|
@ -93,7 +93,7 @@ if __name__ == '__main__':
|
||||||
|
|
||||||
if not wallet.file_exists and cmd not in ['help','create','restore']:
|
if not wallet.file_exists and cmd not in ['help','create','restore']:
|
||||||
print "Wallet file not found."
|
print "Wallet file not found."
|
||||||
print "Type 'electrum.py create' to create a new wallet, or provide a path to a wallet with the -d option"
|
print "Type 'electrum create' to create a new wallet, or provide a path to a wallet with the -w option"
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
|
|
||||||
if cmd in ['create', 'restore']:
|
if cmd in ['create', 'restore']:
|
||||||
|
|
|
@ -86,7 +86,7 @@ if __name__ == '__main__':
|
||||||
|
|
||||||
if len(sys.argv)>1:
|
if len(sys.argv)>1:
|
||||||
import jsonrpclib
|
import jsonrpclib
|
||||||
server = jsonrpclib.Server('http://%s:%d'%(host,port))
|
server = jsonrpclib.Server('http://%s:%s@%s:%d'%(username, password, host, port))
|
||||||
cmd = sys.argv[1]
|
cmd = sys.argv[1]
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue