From 4848e9196edcfad873071c181e97325cf5d0d57e Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Sun, 27 Aug 2023 10:33:17 +0200
Subject: [PATCH] Fixing Makefile and ansible playbook Signed-off-by: Jeroen
 Oudshoorn <oudshoorn.jeroen@gmail.com>

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
---
 builder/pwnagotchi.json | 88 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 79 insertions(+), 9 deletions(-)

diff --git a/builder/pwnagotchi.json b/builder/pwnagotchi.json
index 45cc5397..a03c9d2c 100644
--- a/builder/pwnagotchi.json
+++ b/builder/pwnagotchi.json
@@ -11,9 +11,86 @@
     {
       "type": "shell",
       "inline": [
-        "uname -a",
+        "sed -i 's/^\\([^#]\\)/#\\1/g' /etc/ld.so.preload",
         "dpkg-architecture",
-        "mkdir -p /usr/local/src/pwnagotchi"
+        "apt-get -y --allow-releaseinfo-change update",
+        "apt-get install -y ansible"
+      ]
+    },
+    {
+      "type": "file",
+      "source": "data/usr/bin/pwnlib",
+      "destination": "/usr/bin/pwnlib"
+    },
+    {
+      "type": "file",
+      "source": "data/usr/bin/bettercap-launcher",
+      "destination": "/usr/bin/bettercap-launcher"
+    },
+    {
+      "type": "file",
+      "source": "data/usr/bin/pwnagotchi-launcher",
+      "destination": "/usr/bin/pwnagotchi-launcher"
+    },
+    {
+      "type": "file",
+      "source": "data/usr/bin/monstop",
+      "destination": "/usr/bin/monstop"
+    },
+    {
+      "type": "file",
+      "source": "data/usr/bin/monstart",
+      "destination": "/usr/bin/monstart"
+    },
+    {
+      "type": "file",
+      "source": "data/usr/bin/hdmion",
+      "destination": "/usr/bin/hdmion"
+    },
+    {
+      "type": "file",
+      "source": "data/usr/bin/hdmioff",
+      "destination": "/usr/bin/hdmioff"
+    },
+    {
+      "type": "file",
+      "source": "data/etc/network/interfaces.d/lo-cfg",
+      "destination": "/etc/network/interfaces.d/lo-cfg"
+    },
+    {
+      "type": "file",
+      "source": "data/etc/network/interfaces.d/wlan0-cfg",
+      "destination": "/etc/network/interfaces.d/wlan0-cfg"
+    },
+    {
+      "type": "file",
+      "source": "data/etc/network/interfaces.d/usb0-cfg",
+      "destination": "/etc/network/interfaces.d/usb0-cfg"
+    },
+    {
+      "type": "file",
+      "source": "data/etc/network/interfaces.d/eth0-cfg",
+      "destination": "/etc/network/interfaces.d/eth0-cfg"
+    },
+    {
+      "type": "file",
+      "source": "data/etc/systemd/system/pwngrid-peer.service",
+      "destination": "/etc/systemd/system/pwngrid-peer.service"
+    },
+    {
+      "type": "file",
+      "source": "data/etc/systemd/system/pwnagotchi.service",
+      "destination": "/etc/systemd/system/pwnagotchi.service"
+    },
+    {
+      "type": "file",
+      "source": "data/etc/systemd/system/bettercap.service",
+      "destination": "/etc/systemd/system/bettercap.service"
+    },
+    {
+      "type": "shell",
+      "inline": [
+        "chmod +x /usr/bin/*"
       ]
     },
     {
@@ -23,13 +100,6 @@
       ],
       "destination": "/usr/local/src/pwnagotchi/"
     },
-    {
-      "type": "shell",
-      "inline": [
-        "apt-get -y --allow-releaseinfo-change update",
-        "apt-get install -y --no-install-recommends ansible"
-      ]
-    },
     {
       "type": "ansible-local",
       "playbook_file": "pwnagotchi.yml",