From 6697479995eebd1b57b6280431069fc41f918d37 Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Thu, 31 Aug 2023 20:01:54 +0200
Subject: [PATCH] V2.2.1 Signed-off-by: Jeroen Oudshoorn
 <oudshoorn.jeroen@gmail.com>

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
---
 builder/pwnagotchi.yml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index 89b489fa..33cc9933 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -37,7 +37,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/evilsocket/pwngrid/releases/download/v1.10.3/pwngrid_linux_aarch64_v1.10.3.zip"
       apt:
         hold:
           - libpcap-dev
@@ -266,13 +266,6 @@
       extra_args: "--no-cache-dir"
     when: (pwnagotchigit.changed) or (pip_packages['pwnagotchi'] is undefined) or (pip_packages['pwnagotchi'] != pwnagotchi_version)
 
-  - name: download and install pwngrid
-    unarchive:
-      src: "{{ packages.pwngrid.url }}"
-      dest: /usr/local/bin
-      remote_src: yes
-      mode: 0755
-
   # Install go-1.20.6
   - name: Install go-1.21
     unarchive:
@@ -290,6 +283,19 @@
         export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin
     when: golang.changed
 
+  - name: download pwngrid
+    git:
+      repo: https://github.com/jayofelony/pwngrid.git
+      dest: /usr/local/src/
+    register: pwngrid
+
+  - name: install pwngrid
+    shell: "export GOPATH=$HOME/go && export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin && make && sudo make install"
+    arsg:
+      executables: /bin/bash
+    chdir: /usr/local/src/pwngrid
+    when: pwngrid.changed
+
   - 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"
     args: