From 06a4491008b90eedf0f6fd991ceb2f8ceb7212c9 Mon Sep 17 00:00:00 2001
From: jayofelony <oudshoorn.jeroen@gmail.com>
Date: Wed, 27 Mar 2024 07:17:35 +0100
Subject: [PATCH] Update 32bit to use latest pwngrid/bettercap

Signed-off-by: jayofelony <oudshoorn.jeroen@gmail.com>
---
 builder/raspberrypi32.yml         | 43 +++++++++++++++++++++----------
 pwnagotchi/ui/hw/waveshare3in7.py |  4 +--
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/builder/raspberrypi32.yml b/builder/raspberrypi32.yml
index 17f45e8d..fc8ef338 100644
--- a/builder/raspberrypi32.yml
+++ b/builder/raspberrypi32.yml
@@ -374,21 +374,36 @@
       when: golang.changed
 
     - name: download pwngrid
-      unarchive:
-        remote_src: yes
-        src: "{{ packages.opwngrid.url }}"
-        dest: /usr/local/bin/
-        mode: 0755
+      git:
+        repo: "{{ packages.pwngrid.source }}"
+        dest: /usr/local/src/pwngrid
 
-    - name: download and install bettercap
-      unarchive:
-        src: "{{ packages.bettercap.url }}"
-        dest: /usr/local/bin
-        remote_src: yes
-        exclude:
-          - README.md
-          - LICENSE.md
-        mode: 0755
+    - name: install pwngrid
+      shell: "export GOPATH=$HOME/go && export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin && go mod tidy && make && make install"
+      args:
+        executable: /bin/bash
+        chdir: /usr/local/src/pwngrid
+
+    - name: remove pwngrid folder
+      file:
+        state: absent
+        path: /usr/local/src/pwngrid
+
+    - name: download bettercap
+      git:
+        repo: "{{ packages.bettercap.source }}"
+        dest: /usr/local/src/bettercap
+
+    - name: install bettercap 2.32.4
+      shell: "export GOPATH=$HOME/go && export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin && go mod tidy && make && make install"
+      args:
+        executable: /bin/bash
+        chdir: /usr/local/src/bettercap
+
+    - name: remove bettercap folder
+      file:
+        state: absent
+        path: /usr/local/src/bettercap
 
     - name: clone bettercap caplets
       git:
diff --git a/pwnagotchi/ui/hw/waveshare3in7.py b/pwnagotchi/ui/hw/waveshare3in7.py
index 2b2cf155..f792845a 100644
--- a/pwnagotchi/ui/hw/waveshare3in7.py
+++ b/pwnagotchi/ui/hw/waveshare3in7.py
@@ -10,8 +10,8 @@ class Waveshare3in7(DisplayImpl):
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)
-        self._layout['width'] = 280
-        self._layout['height'] = 480
+        self._layout['width'] = 480
+        self._layout['height'] = 280
         self._layout['face'] = (0, 43)
         self._layout['name'] = (0, 14)
         self._layout['channel'] = (0, 0)