From c0040ddcde14b5ec4378600b51dc25cb7410f0db Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Sun, 23 Jul 2023 10:36:39 +0200
Subject: [PATCH] Edited README.md and others

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
---
 README.md                                | 38 +++++++++++++++---------
 builder/data/usr/bin/bettercap-launcher  |  4 +--
 builder/data/usr/bin/pwnagotchi-launcher |  4 +--
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index d14f0dcf..394d2731 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Pwnagotchi Torch installation
-I assume you have a new image of Raspberry Pi OS lite 64-bit flashed to a micro sd-card.
+I assume you have a new (fully upgraded) image of Raspberry Pi OS lite 64-bit flashed to a micro sd-card.
 
 
 # Install GoLang
@@ -14,15 +14,19 @@ sudo visudo
 :/usr/local/go/bin # Add this to secure_path= line
 ```
 
+# Install nexmon for Raspberry Pi Zero 2 W or Raspberry Pi 4
+First use dmesg | grep brcm
 
-# apt hold packages
+Write down what chip it uses (bcm43430 / bcm43455 / bcm43436)
+
+-------------
 ```
-sudo apt-mark hold raspberrypi-kernel
-sudo apt install raspberrypi-kernel-headers
-sudo apt-mark hold raspberrypi-kernel-headers
-sudo apt -y update
-sudo apt -y upgrade
+sudo apt install raspberrypi-kernel-headers git libgmp3-dev gawk qpdf bison flex make autoconf libtool texinfo gcc-arm-none-eabi wl libfl-dev g++ xxd
+cd ~
+git clone https://github.com/jayofelony/nexmon.git
+cd nexmon
 ```
+Follow [README](https://github.com/jayofelony/nexmon#build-patches-for-bcm43430a1-on-the-rpi3zero-w-or-bcm434355c0-on-the-rpi3rpi4-or-bcm43436b0-on-the-rpi-zero-2w-using-raspbianraspberry-pi-os-recommended)
 
 # Set-up dependencies
 ```
@@ -95,7 +99,7 @@ cat /tmp/dependencies | xargs -n5 sudo apt install -y
 cd ~
 git clone https://github.com/jayofelony/bettercap.git
 cd bettercap
-make all
+sudo make
 sudo make install
 sudo bettercap -eval "caplets.update; ui.update; quit"
 sudo nano /usr/local/share/bettercap/caplets/pwnagotchi-auto.cap # change iface to wlan0
@@ -107,7 +111,7 @@ sudo nano /usr/local/share/bettercap/caplets/pwnagotchi-manual.cap # change ifac
 cd ~
 git clone https://github.com/jayofelony/pwngrid.git
 cd bettercap
-make
+sudo make
 sudo make install
 sudo pwngrid -generate -keys /etc/pwnagotchi
 ```
@@ -160,12 +164,18 @@ sudo apt -y install ./libpcap*.deb  --allow-downgrades
 sudo apt-mark hold libpcap-dev libpcap0.8 libpcap0.8-dev
 ```
 
-# Enable all services and reboot
+# Enable all services, permissions and reboot
 ```
-sudo systemctl enable bettercap
-sudo systemctl enable pwngrid-peer
-sudo systemctl enable pwnagotchi
-sudo systemctl enable bluetooth
+sudo chmod 755 /usr/local/bin/bettercap
+sudo chown root:root /usr/local/bin/bettercap
+sudo chmod 755 /usr/bin/bettercap-launcher
+sudo chmod 755 /usr/local/bin/pwngrid
+sudo chown root:root /usr/local/bin/pwngrid
+sudo chmod 755 /usr/local/bin/pwnagotchi
+sudo chown root:root /usr/local/bin/pwnagotchi
+sudo chmod 711 /usr/bin/pwnagotchi-launcher
+sudo chmod 755 /usr/local/share/bettercap/
+sudo systemctl enable bettercap pwngrid-peer pwnagotchi bluetooth
 sudo sync
 sudo reboot
 ```
diff --git a/builder/data/usr/bin/bettercap-launcher b/builder/data/usr/bin/bettercap-launcher
index ad916c5b..b10a5264 100755
--- a/builder/data/usr/bin/bettercap-launcher
+++ b/builder/data/usr/bin/bettercap-launcher
@@ -22,7 +22,7 @@ fi
 start_monitor_interface
 
 if is_auto_mode_no_delete; then
-  /usr/local/bin/bettercap -no-colors -caplet pwnagotchi-auto -iface wlan0
+  /usr/local/bin/bettercap -no-colors -caplet pwnagotchi-auto -iface wlan0 -debug
 else
-  /usr/local/bin/bettercap -no-colors -caplet pwnagotchi-manual -iface wlan0
+  /usr/local/bin/bettercap -no-colors -caplet pwnagotchi-manual -iface wlan0 -debug
 fi
diff --git a/builder/data/usr/bin/pwnagotchi-launcher b/builder/data/usr/bin/pwnagotchi-launcher
index a56665f9..ea30cf39 100755
--- a/builder/data/usr/bin/pwnagotchi-launcher
+++ b/builder/data/usr/bin/pwnagotchi-launcher
@@ -13,7 +13,7 @@ fi
 blink_led 10 &
 
 if is_auto_mode; then
-  /usr/local/bin/pwnagotchi
+  /usr/local/bin/pwnagotchi --debug
 else
-  /usr/local/bin/pwnagotchi --manual
+  /usr/local/bin/pwnagotchi --manual --debug
 fi