Merge pull request #2 from rai68/master

Update utils.py

README.md

@@ -1,6 +1,6 @@
 # Pwnagotchi-Torch
 <a href="https://github.com/jayofelony/pwnagotchi-bookworm/releases/latest"><img alt="Release" src="https://img.shields.io/github/release/jayofelony/pwnagotchi-bookworm.svg"></a><br/>
-**This fork of [Pwnagotchi](https://www.pwnagotchi.ai) is only for 64-bit Raspberry Pi's. Such as the 02W, 3(b+) and 4(b).**
+**This fork of [Pwnagotchi](https://www.pwnagotchi.ai) is only for 64-bit Raspberry Pi's. Such as the 02W, 3(b+) and 4(b) and the new Raspberry Pi 5!!.**
 
 If you are using an older 32-bit version Raspberry Pi, ZeroWH, use this [fork](https://github.com/jayofelony/pwnagotchi-torch/releases/tag/v2.5.4) and make sure you download the `armhf` version.
 

pwnagotchi/_version.py

@@ -1 +1 @@
-__version__ = '2.6.2'
+__version__ = '2.6.3'

pwnagotchi/defaults.toml

@@ -160,8 +160,6 @@ personality.bond_encounters_factor = 20000
 personality.throttle_a = 0.4
 personality.throttle_d = 0.9
 
-ui.invert = false
-
 ui.fps = 0.0
 ui.font.name = "DejaVuSansMono" # for japanese: fonts-japanese-gothic
 ui.font.size_offset = 0 # will be added to the font size

pwnagotchi/ui/web/handler.py

@@ -188,6 +188,11 @@ class Handler:
             checked = True if 'enabled' in request.form else False
             return 'success' if plugins.toggle_plugin(request.form['plugin'], checked) else 'failed'
 
+        if name == 'upgrade' and request.method == 'POST':
+            logging.info(f"Upgrading plugin: {request.form['plugin']}")
+            os.system(f"pwnagotchi plugins update && pwnagotchi plugins upgrade {request.form['plugin']}")
+            return redirect("/plugins")
+
         if name in plugins.loaded and plugins.loaded[name] is not None and hasattr(plugins.loaded[name], 'on_webhook'):
             try:
                 return plugins.loaded[name].on_webhook(subpath, request)

pwnagotchi/ui/web/templates/plugins.html

@@ -76,6 +76,11 @@ $(function(){
             <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
             <input type="hidden" name="plugin" value="{{ name }}"/>
           </form>
+            <form method="POST" action="/plugins/upgrade">
+                <input type="submit" name="upgrade" value="Upgrade">
+                <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
+                <input type="hidden" name="plugin" value="{{ name }}"/>
+            </form>
         </div>
     {% endfor %}
 </div>

pwnagotchi/utils.py

@@ -165,8 +165,7 @@ def load_config(args):
     ref_defaults_data = None
 
     # check for a config.yml file on /boot/firmware
-    for boot_conf in ['/boot/config.yml', '/boot/firmware/config.yml',
+    for boot_conf in ['/boot/config.yml', '/boot/firmware/config.yml', '/boot/config.toml', '/boot/firmware/config.toml']:
-                      '/boot/config.toml', '/boot/firmware/config.toml']:
         if os.path.exists(boot_conf):
             if os.path.exists(args.user_config):
                 # if /etc/pwnagotchi/config.toml already exists we just merge the new config