From ecd4c05b84bc2277e801a13e150a0f6063475969 Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Tue, 29 Aug 2023 21:02:43 +0200
Subject: [PATCH] Small update version 2.1.1

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
---
 .idea/workspace.xml     | 24 ++++++++++++++++++++----
 Makefile                |  6 +++---
 builder/pwnagotchi.json | 16 +++-------------
 builder/pwnagotchi.yml  | 41 +++++++++++++----------------------------
 pwnagotchi/_version.py  |  2 +-
 5 files changed, 40 insertions(+), 49 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 85e7094b..d0c23b92 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,9 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="86d472f7-3417-4a77-9947-c1c255a4f4e8" name="Changes" comment="Update Makefile">
-      <change beforePath="$PROJECT_DIR$/.DEREK.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.travis.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -48,12 +46,12 @@
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "WebServerToolWindowFactoryState": "false",
-    "git-widget-placeholder": "pwnagotchi-torch",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
     "node.js.selected.package.eslint": "(autodetect)",
     "node.js.selected.package.tslint": "(autodetect)",
     "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings",
     "vue.rearranger.settings.migration": "true"
   }
 }]]></component>
@@ -68,6 +66,13 @@
       <workItem from="1693181063054" duration="672000" />
       <workItem from="1693181774881" duration="48000" />
       <workItem from="1693209737513" duration="271000" />
+      <workItem from="1693308042171" duration="8000" />
+      <workItem from="1693308261277" duration="87000" />
+      <workItem from="1693308365487" duration="13000" />
+      <workItem from="1693309300580" duration="42000" />
+      <workItem from="1693311805926" duration="418000" />
+      <workItem from="1693332220165" duration="602000" />
+      <workItem from="1693333349115" duration="1395000" />
     </task>
     <task id="LOCAL-00001" summary="Update Makefile">
       <option name="closed" value="true" />
@@ -83,6 +88,17 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Update Makefile" />
     <option name="LAST_COMMIT_MESSAGE" value="Update Makefile" />
diff --git a/Makefile b/Makefile
index 8376bc75..c53447c1 100644
--- a/Makefile
+++ b/Makefile
@@ -39,9 +39,9 @@ $(PWN_RELEASE).img: | $(PACKER)
 # If the packer or ansible files are updated, rebuild the image.
 $(PWN_RELEASE).img: $(SDIST) builder/pwnagotchi.json builder/pwnagotchi.yml $(shell find builder/data -type f)
 	# $(PACKER) plugins install github.com/mkaczanowski/builder-arm
-	cd builder/packer-builder-arm/packer-builder-arm && sudo $(UNSHARE) $(PACKER) build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" ../../pwnagotchi.json
-	sudo chown -R $$USER:$$USER ../../builder/output-pwnagotchi
-	mv ../../builder/output-pwnagotchi/image $@
+	cd builder/packer-builder-arm/ && sudo $(UNSHARE) $(PACKER) build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" ../pwnagotchi.json
+	sudo chown -R $$USER:$$USER ../builder/output-pwnagotchi
+	mv ../builder/output-pwnagotchi/image $@
 
 # If any of these files are updated, rebuild the checksums.
 $(PWN_RELEASE).sha256: $(PWN_RELEASE).img
diff --git a/builder/pwnagotchi.json b/builder/pwnagotchi.json
index fdbe78a6..90fe4b32 100644
--- a/builder/pwnagotchi.json
+++ b/builder/pwnagotchi.json
@@ -36,27 +36,17 @@
     }
   ],
   "provisioners": [
-    {
-      "inline": ["mkdir -p /usr/local/src/pwnagotchi"],
-      "type": "shell"
-    },
-    {
-      "type": "file",
-      "sources": [
-        "../../../dist/pwnagotchi-{{user `pwn_version`}}.tar.gz"
-      ],
-      "destination": "/usr/local/src/pwnagotchi/"
-    },
     {
       "type": "shell",
       "inline": [
         "apt-get -y --allow-releaseinfo-change update",
-        "apt-get install -y --no-install-recommends ansible"
+        "apt-get -y dist-upgrade",
+        "apt-get install -y ansible"
       ]
     },
     {
       "type": "ansible-local",
-      "playbook_file": "../../../builder/pwnagotchi.yml",
+      "playbook_file": "../../builder/pwnagotchi.yml",
       "extra_arguments": [
         "--extra-vars \"ansible_python_interpreter=/usr/bin/python3\""
       ],
diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index a636167a..09aa38d5 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -171,11 +171,6 @@
       state: absent
       purge: yes
 
-  - name: upgrade apt distro
-    become_user: root
-    apt:
-      upgrade: dist
-
   - name: install packages
     become_user: root
     apt:
@@ -303,22 +298,25 @@
     command: ln -s /usr/local/bin/bettercap /usr/bin/bettercap
     when: bettercap.changed
 
-  - 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:
       repo: https://github.com/jayofelony/caplets.git
       dest: /tmp/caplets
     register: capletsgit
 
+  - name: install bettercap caplets
+    make:
+      chdir: /tmp/caplets
+      target: install
+    when: capletsgit.changed
+
+  - name: download and install bettercap ui
+    unarchive:
+      src: "{{ packages.bettercap.ui }}"
+      dest: /usr/local/share/bettercap/
+      remote_src: yes
+      mode: 0755
+
 # Install nexmon to fix wireless scanning (takes 2.5G of space)
   - name: clone nexmon repository
     git:
@@ -417,19 +415,6 @@
       state: absent
       path: /usr/local/src/nexmon/
 
-  - name: install bettercap caplets
-    make:
-      chdir: /tmp/caplets
-      target: install
-    when: capletsgit.changed
-
-  - name: download and install bettercap ui
-    unarchive:
-      src: "{{ packages.bettercap.ui }}"
-      dest: /usr/local/share/bettercap/
-      remote_src: yes
-      mode: 0755
-
   - name: add HDMI powersave to rc.local
     blockinfile:
       path: /etc/rc.local
diff --git a/pwnagotchi/_version.py b/pwnagotchi/_version.py
index d980f276..55fa725b 100644
--- a/pwnagotchi/_version.py
+++ b/pwnagotchi/_version.py
@@ -1 +1 @@
-__version__ = '2.1'
+__version__ = '2.1.1'