From c363644554cc63531400c2ed9bcf4024a17c5dc5 Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Sun, 5 Nov 2023 21:02:33 +0100
Subject: [PATCH] v2.5.1

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
---
 builder/orangepi.yml      | 26 ++++++++++----------------
 builder/raspberrypi64.yml | 26 ++++++++++----------------
 2 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/builder/orangepi.yml b/builder/orangepi.yml
index 16f77dc5..456b4ad7 100644
--- a/builder/orangepi.yml
+++ b/builder/orangepi.yml
@@ -46,7 +46,7 @@
         url: "http://ports.ubuntu.com/pool/universe/b/bettercap/bettercap_2.32.0-2build1_arm64.deb"
         ui: "https://github.com/bettercap/ui/releases/download/v1.3.0/ui.zip"
       pwngrid:
-        # url: "https://github.com/evilsocket/pwngrid/releases/download/v1.10.3/pwngrid_linux_aarch64_v1.10.3.zip"
+        url: "https://github.com/rai68/opwngrid/releases/download/publish/pwngrid_linux_aarch64_v1.10.3-1.zip"
       apt:
         downgrade:
           - libpcap-dev_1.9.1-4_arm64.deb
@@ -268,21 +268,15 @@
         state: absent
         path: /usr/local/src/pwngrid
 
-    - name: download bettercap deb
-      get_url:
-        url: "{{ packages.bettercap.url }}"
-        dest: /usr/local/src/
-
-    - name: install bettercap deb
-      apt:
-        force: True
-        state: present
-        deb: "/usr/local/src/bettercap_2.32.0-2build1_arm64.deb"
-
-    - name: remove bettercap deb
-      file:
-        state: absent
-        path: "/usr/local/src/bettercap_2.32.0-2build1_arm64.deb"
+    - name: download and install bettercap
+      unarchive:
+        src: "{{ packages.bettercap.url }}"
+        dest: /usr/bin
+        remote_src: yes
+        exclude:
+          - README.md
+          - LICENSE.md
+        mode: 0755
 
     - name: clone bettercap caplets
       git:
diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml
index e9bbca73..65dcb14d 100644
--- a/builder/raspberrypi64.yml
+++ b/builder/raspberrypi64.yml
@@ -44,7 +44,7 @@
         url: "https://github.com/jayofelony/bettercap/releases/download/2.32.1/bettercap-2.32.1.zip"
         ui: "https://github.com/bettercap/ui/releases/download/v1.3.0/ui.zip"
       pwngrid:
-        # url: "https://github.com/evilsocket/pwngrid/releases/download/v1.10.3/pwngrid_linux_aarch64_v1.10.3.zip"
+        url: "https://github.com/rai68/opwngrid/releases/download/publish/pwngrid_linux_aarch64_v1.10.3-1.zip"
       apt:
         downgrade:
           - libpcap-dev_1.9.1-4_arm64.deb
@@ -350,21 +350,15 @@
         state: absent
         path: /usr/local/src/pwngrid
 
-    - name: download bettercap deb
-      get_url:
-        url: "{{ packages.bettercap.url }}"
-        dest: /usr/local/src/
-
-    - name: install bettercap deb
-      apt:
-        force: True
-        state: present
-        deb: "/usr/local/src/bettercap_2.32.0-2build1_arm64.deb"
-
-    - name: remove bettercap deb
-      file:
-        state: absent
-        path: "/usr/local/src/bettercap_2.32.0-2build1_arm64.deb"
+    - name: download and install bettercap
+      unarchive:
+        src: "{{ packages.bettercap.url }}"
+        dest: /usr/bin
+        remote_src: yes
+        exclude:
+          - README.md
+          - LICENSE.md
+        mode: 0755
 
     #- name: download bettercap v2.32.1
     #  git: