diff --git a/.idea/misc.xml b/.idea/misc.xml index 6178365c..dc9ea490 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/.idea/pwnagotchi.iml b/.idea/pwnagotchi.iml index 7e680cfc..38d1fd89 100644 --- a/.idea/pwnagotchi.iml +++ b/.idea/pwnagotchi.iml @@ -4,7 +4,7 @@ - + diff --git a/Makefile b/Makefile index 23ff36d5..e64c9a2f 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ $(PWN_RELEASE).img: $(SDIST) builder/pwnagotchi.json builder/pwnagotchi.yml $(sh sudo $(PACKER) plugins install github.com/solo-io/arm-image cd builder && sudo $(UNSHARE) $(PACKER) build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" pwnagotchi.json sudo chown -R $$USER:$$USER builder/images - mv builder/images ../../../../ + mv builder/images/* ../../../ # If any of these files are updated, rebuild the checksums. $(PWN_RELEASE).sha256: $(PWN_RELEASE).img diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml index 7e0355b7..654f4b0a 100644 --- a/builder/pwnagotchi.yml +++ b/builder/pwnagotchi.yml @@ -65,7 +65,7 @@ - libraspberrypi-dev - libraspberrypi-doc - libraspberrypi-bin - - golang + - ansible install: - bluez - raspberrypi-kernel-headers @@ -342,7 +342,7 @@ state: absent path: /usr/local/src/nexmon/ - - name: Creates custom plugin directory + - name: Create custom plugin directory file: path: /usr/local/share/pwnagotchi/custom-plugins/ state: directory @@ -519,44 +519,6 @@ regexp: '(.*)$' line: '\1 modules-load=dwc2,g_ether' - - name: configure 01-motd - become_user: root - copy: - dest: /etc/update-motd.d/01-motd - content: | - #!/bin/sh - _hostname=$(hostname) - _version=$(cut -d"'" -f2 < /usr/local/lib/python3.9/dist-packages/pwnagotchi/_version.py) - echo - echo "(◕‿‿◕) $_hostname" - echo - echo " Hi! I'm a pwnagotchi $_version, please take good care of me!" - echo " Here are some basic things you need to know to raise me properly!" - echo - echo " If you want to change my configuration, use /etc/pwnagotchi/config.toml" - echo - echo " All the configuration options can be found on /etc/pwnagotchi/default.toml," - echo " but don't change this file because I will recreate it every time I'm restarted!" - echo - echo " I use oPwnGrid as my main API, you can check stats at https://opwngrid.xyz" - echo - echo " I'm managed by systemd. Here are some basic commands." - echo - echo " If you want to know what I'm doing, you can check my logs with the command" - echo " - pwnlog" - echo " - sudo pwnagotchi --version, to check the current version" - echo " - sudo pwnagotchi --donate, to see how you can donate to this project" - echo " - sudo pwnagotchi --check-update, to see if there is a new version available" - echo - echo " If you want to know if I'm running, you can use" - echo " systemctl status pwnagotchi" - echo - echo " You can restart me using" - echo " systemctl restart pwnagotchi" - echo - echo " You learn more about me at https://pwnagotchi.ai/" - when: hostname.changed - - name: Add pwnlog alias lineinfile: dest: /home/pi/.bashrc diff --git a/pwnagotchi/_version.py b/pwnagotchi/_version.py index 9a0e3da6..0d6ef5fb 100644 --- a/pwnagotchi/_version.py +++ b/pwnagotchi/_version.py @@ -1 +1 @@ -__version__ = '2.4.3' +__version__ = '2.4.4'