From 683d260c749bc240278df4690ad619360ffc697e Mon Sep 17 00:00:00 2001
From: Simone Margaritelli <evilsocket@gmail.com>
Date: Fri, 4 Oct 2019 00:50:33 +0200
Subject: [PATCH] misc: small fix or general refactoring i did not bother
commenting
---
.../pwnagotchi/scripts/pwnagotchi/plugins/__init__.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/__init__.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/__init__.py
index bb090da..b6f33f3 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/__init__.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/__init__.py
@@ -43,8 +43,12 @@ def load_from_path(path, enabled=()):
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'])
+ enabled = config['main']['plugins']
+ custom_path = config['main']['custom_plugins'] if 'custom_plugins' in config['main'] else None
+ # load default plugins
+ load_from_path(default_path, enabled=enabled)
+ # load custom ones
+ if custom_path is not None:
+ load_from_path(custom_path, enabled=enabled)
on('loaded')