From 924a76153ef30bc8d9f7fd34a77f624c2e28eec4 Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Sun, 22 Oct 2023 18:25:02 +0200
Subject: [PATCH] Revert "v2.5.0"

This reverts commit 0df77f24d351a1266282e8ff3b07e79c55071e0e.
---
 builder/pwnagotchi.yml                    | 7 +++----
 pwnagotchi/plugins/default/auto-update.py | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index 68c4a83f..33b3a950 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -121,7 +121,6 @@
           - libusb-1.0-0-dev
           - lsof
           - make
-          - pipx
           - python3-dbus
           - python3-flask
           - python3-flask-cors
@@ -300,9 +299,9 @@
     when: (pwnagotchigit.changed) or (pip_packages['pwnagotchi'] is undefined) or (pip_packages['pwnagotchi'] != pwnagotchi_version)
 
   - name: install pwnagotchi wheel and dependencies
-    command: "pipx install dist/pwnagotchi*.whl"
-    args:
-      chdir: /usr/local/src/pwnagotchi
+    pip:
+      name: "{{ lookup('fileglob', '/usr/local/src/pwnagotchi/dist/pwnagotchi*.whl') }}"
+      extra_args: "--no-cache-dir"
     when: (pwnagotchigit.changed) or (pip_packages['pwnagotchi'] is undefined) or (pip_packages['pwnagotchi'] != pwnagotchi_version)
 
   - name: remove pwnagotchi folder
diff --git a/pwnagotchi/plugins/default/auto-update.py b/pwnagotchi/plugins/default/auto-update.py
index f4b1999e..84dde6f3 100644
--- a/pwnagotchi/plugins/default/auto-update.py
+++ b/pwnagotchi/plugins/default/auto-update.py
@@ -126,7 +126,7 @@ def install(display, update):
             source_path = "%s-%s" % (source_path, update['available'])
 
         # setup.py is going to install data files for us
-        os.system("cd %s && pipx install ." % source_path)
+        os.system("cd %s && pip3 install ." % source_path)
     return True