From f9d3ce58a53062c1cc7d61fdcf61f40f918189be Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Tue, 3 Oct 2023 14:53:17 +0200 Subject: [PATCH] v2.4.6 Signed-off-by: Jeroen Oudshoorn --- builder/pwnagotchi.json | 13 ------------- builder/pwnagotchi.yml | 19 ++++++++++++++++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/builder/pwnagotchi.json b/builder/pwnagotchi.json index 24ca7021..d9c87f78 100644 --- a/builder/pwnagotchi.json +++ b/builder/pwnagotchi.json @@ -11,19 +11,6 @@ } ], "provisioners": [ - { - "type": "shell", - "inline": [ - "mkdir -p /usr/local/src/pwnagotchi" - ] - }, - { - "type": "file", - "sources": [ - "../dist/pwnagotchi-{{user `pwn_version`}}.tar.gz" - ], - "destination": "/usr/local/src/pwnagotchi/" - }, { "type": "file", "source": "../builder/data/usr/bin/pwnlib", diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml index bafd3adb..144d47bd 100644 --- a/builder/pwnagotchi.yml +++ b/builder/pwnagotchi.yml @@ -346,10 +346,23 @@ path: /usr/local/share/pwnagotchi/custom-plugins/ state: directory - - name: Install pwnagotchi from source archive + - name: clone pwnagotchi repository + git: + repo: https://github.com/evilsocket/pwnagotchi.git + dest: /usr/local/src/pwnagotchi + register: pwnagotchigit + + - name: build pwnagotchi wheel + command: "python3 setup.py sdist bdist_wheel" + args: + chdir: /usr/local/src/pwnagotchi + when: pwnagotchigit.changed + + - name: install pwnagotchi wheel and dependencies pip: - name: /usr/local/src/pwnagotchi/pwnagotchi-{{ pwnagotchi.version }}.tar.gz - extra_args: --verbose --prefer-binary --ignore-installed + name: "{{ lookup('fileglob', '/usr/local/src/pwnagotchi/dist/pwnagotchi*.whl') }}" + extra_args: "--no-cache-dir" + when: pwnagotchigit.changed - name: create /usr/local/share/pwnagotchi/ folder file: