From a816c88ce3eb1dfa5a668bcab6075c433229d67f Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Sun, 24 Sep 2023 00:43:14 +0200
Subject: [PATCH] Enabled plugin stats

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
---
 builder/pwnagotchi.yml             | 17 ++++++++++++-----
 pwnagotchi/plugins/__init__.py     |  2 +-
 pwnagotchi/plugins/default/grid.py |  1 +
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index efa9f062..ec8366c2 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -409,24 +409,31 @@
         export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin
     when: golang.changed
 
-  - name: download pwngrid
+  - name: download pwngrid 1.10.4
     git:
       repo: https://github.com/jayofelony/pwngrid.git
       dest: /usr/local/src/pwngrid
     register: pwngrid
 
-  - name: install pwngrid
-    shell: "export GOPATH=$HOME/go && export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin && make && sudo make install"
+  - 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
       chdir: /usr/local/src/pwngrid
     when: pwngrid.changed
 
+  - name: download bettercap v2.32.1
+    git:
+      repo: https://github.com/jayofelony/bettercap.git
+      dest: /usr/local/src/bettercap
+    register: bettercap
+
   - name: Install bettercap v2.32.1
-    shell: "export GOPATH=$HOME/go && export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin && go env -w GO111MODULE=off && go get github.com/jayofelony/bettercap && cd $GOPATH/src/github.com/jayofelony/bettercap && make build && make install"
+    shell: "export GOPATH=$HOME/go && export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin && sudo make && sudo make install"
     args:
       executable: /bin/bash
-    register: bettercap
+      chdir: /usr/local/src/bettercap
+    when: bettercap.changed
 
   - name: clone bettercap caplets
     git:
diff --git a/pwnagotchi/plugins/__init__.py b/pwnagotchi/plugins/__init__.py
index 00595e02..c5d2efd7 100644
--- a/pwnagotchi/plugins/__init__.py
+++ b/pwnagotchi/plugins/__init__.py
@@ -44,7 +44,7 @@ def toggle_plugin(name, enable=True):
     global loaded, database
 
     if pwnagotchi.config:
-        if not name in pwnagotchi.config['main']['plugins']:
+        if name not in pwnagotchi.config['main']['plugins']:
             pwnagotchi.config['main']['plugins'][name] = dict()
         pwnagotchi.config['main']['plugins'][name]['enabled'] = enable
         save_config(pwnagotchi.config, '/etc/pwnagotchi/config.toml')
diff --git a/pwnagotchi/plugins/default/grid.py b/pwnagotchi/plugins/default/grid.py
index f4bf48af..79259a3a 100644
--- a/pwnagotchi/plugins/default/grid.py
+++ b/pwnagotchi/plugins/default/grid.py
@@ -5,6 +5,7 @@ import glob
 import re
 
 import pwnagotchi.grid as grid
+import pwnagotchi.plugins
 import pwnagotchi.plugins as plugins
 from pwnagotchi.utils import StatusFile, WifiInfo, extract_from_pcap
 from threading import Lock