diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml index ec8366c2..70a91bbb 100644 --- a/builder/pwnagotchi.yml +++ b/builder/pwnagotchi.yml @@ -418,7 +418,7 @@ - name: install pwngrid 1.10.4 shell: "export GOPATH=$HOME/go && export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin && sudo make && sudo make install" args: - executables: /bin/bash + executable: /bin/bash chdir: /usr/local/src/pwngrid when: pwngrid.changed diff --git a/pwnagotchi/grid.py b/pwnagotchi/grid.py index dab0034f..eecb288f 100644 --- a/pwnagotchi/grid.py +++ b/pwnagotchi/grid.py @@ -60,13 +60,15 @@ def closest_peer(): return all[0] if len(all) else None -def update_data(last_session, plugin_data): +def update_data(last_session): brain = {} try: with open('/root/brain.json') as fp: brain = json.load(fp) except: pass + enabled = [name for name, options in pwnagotchi.config['main']['plugins'].items() if + 'enabled' in options and options['enabled']] data = { 'session': { @@ -85,7 +87,7 @@ def update_data(last_session, plugin_data): 'brain': brain, 'version': pwnagotchi.__version__, 'build': "Pwnagotchi-Torch by Jayofelony", - 'plugins': plugin_data + 'plugins': enabled } logging.debug("updating grid data: %s" % data) diff --git a/pwnagotchi/plugins/__init__.py b/pwnagotchi/plugins/__init__.py index c5d2efd7..0d913b49 100644 --- a/pwnagotchi/plugins/__init__.py +++ b/pwnagotchi/plugins/__init__.py @@ -131,8 +131,6 @@ def load(config): enabled = [name for name, options in config['main']['plugins'].items() if 'enabled' in options and options['enabled']] - pwnagotchi.grid.update_data(None, enabled) - # load default plugins load_from_path(default_path, enabled=enabled) diff --git a/pwnagotchi/plugins/default/grid.py b/pwnagotchi/plugins/default/grid.py index 79259a3a..2fbd0427 100644 --- a/pwnagotchi/plugins/default/grid.py +++ b/pwnagotchi/plugins/default/grid.py @@ -130,7 +130,7 @@ class Grid(plugins.Plugin): with self.lock: try: - grid.update_data(agent.last_session, None) + grid.update_data(agent.last_session) except Exception as e: logging.error("error connecting to the pwngrid-peer service: %s" % e) logging.debug(e, exc_info=True) diff --git a/pwnagotchi/ui/view.py b/pwnagotchi/ui/view.py index 7647ca23..4d05894f 100644 --- a/pwnagotchi/ui/view.py +++ b/pwnagotchi/ui/view.py @@ -40,7 +40,7 @@ class View(object): self._width = self._layout['width'] self._height = self._layout['height'] self._state = State(state={ - 'channel': LabeledValue(color=BLACK, label='CH', value='000', position=self._layout['channel'], + 'channel': LabeledValue(color=BLACK, label='CH', value='00', position=self._layout['channel'], label_font=fonts.Bold, text_font=fonts.Medium), 'aps': LabeledValue(color=BLACK, label='APS', value='0 (00)', position=self._layout['aps'],