scifijunkie/pwnagotchi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc: small fix or general refactoring i did not bother commenting

Browse Source
This commit is contained in:
Simone Margaritelli 2019-10-04 00:48:15 +02:00
parent 26fb21a7c7
commit dae50bc65d
No known key found for this signature in database
GPG Key ID: 82E42E7F3B34C97E
2 changed files with 9 additions and 5 deletions
sdcard/rootfs/root/pwnagotchi/scripts
main.py
pwnagotchi/plugins
__init__.py

6
sdcard/rootfs/root/pwnagotchi/scripts/main.py

@ -29,11 +29,7 @@ args = parser.parse_args()
config = utils.load_config(args)
utils.setup_logging(args, config)
plugins.load_from_path(plugins.default_path, enabled=config['main']['plugins'])
if 'custom_plugins' in config['main'] and config['main']['custom_plugins'] is not None:
plugins.load_from_path(config['main']['custom_plugins'], enabled=config['main']['plugins'])
plugins.on('loaded')
plugins.load(config)
display = Display(config=config, state={'name': '%s>' % pwnagotchi.name()})
agent = Agent(view=display, config=config)

8
sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/__init__.py

@ -40,3 +40,11 @@ def load_from_path(path, enabled=()):
loaded[name] = plugin
return loaded
def load(config):
load_from_path(default_path, enabled=config['main']['plugins'])
if 'custom_plugins' in config['main'] and config['main']['custom_plugins'] is not None:
load_from_path(config['main']['custom_plugins'], enabled=config['main']['plugins'])
on('loaded')