dxs/onionr
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'communicator-multithreading' of github.com:beardog108/onionr into communicator-multithreading

Browse source
This commit is contained in:
Kevin Froman 2018-05-07 01:55:28 -05:00
commit 5af0b5b7a5
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
onionr/onionr.py
View file

@ -110,9 +110,9 @@ class Onionr:
# Copy default plugins into plugins folder
if not os.path.exists(plugins.get_plugins_folder()):
if os.path.exists('default-plugins/'):
names = [f for f in os.listdir("default-plugins/") if not os.path.isfile(f)]
shutil.copytree('default-plugins/', plugins.get_plugins_folder())
if os.path.exists('static-data/default-plugins/'):
names = [f for f in os.listdir("static-data/default-plugins/") if not os.path.isfile(f)]
shutil.copytree('static-data/default-plugins/', plugins.get_plugins_folder())
# Enable plugins
for name in names:
@ -216,7 +216,7 @@ class Onionr:
}
# initialize plugins
events.event('init', onionr = self)
events.event('init', onionr = self, threaded = False)
command = ''
try: