From 074223767764375936eb92323737bb866f530ac2 Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Tue, 7 Nov 2023 08:38:50 +0100 Subject: [PATCH] v2.5.1 Signed-off-by: Jeroen Oudshoorn --- builder/orangepi.yml | 17 +++++++++-------- builder/raspberrypi32.yml | 12 ++++++++---- builder/raspberrypi64.yml | 26 ++++++++++++++------------ 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/builder/orangepi.yml b/builder/orangepi.yml index c71f572a..8804ce26 100644 --- a/builder/orangepi.yml +++ b/builder/orangepi.yml @@ -43,10 +43,11 @@ packages: bettercap: # We will install bettercap from source + source: "https://github.com/jayofelony/bettercap.git" url: "https://github.com/jayofelony/bettercap/releases/download/2.32.1/bettercap-2.32.1.zip" ui: "https://github.com/bettercap/ui/releases/download/v1.3.0/ui.zip" - pwngrid: - source: "https://github.com/jayofelony/pwngrid.git" + opwngrid: + source: "https://github.com/jayofelony/opwngrid.git" url: "https://github.com/rai68/opwngrid/releases/download/publish/pwngrid_linux_aarch64_v1.10.3-1.zip" apt: downgrade: @@ -253,25 +254,25 @@ - name: download pwngrid 1.10.4 git: - repo: https://github.com/jayofelony/pwngrid.git - dest: /usr/local/src/pwngrid + repo: "{{ packages.opwngrid.source }}" + dest: /usr/local/src/opwngrid register: pwngrid - name: install pwngrid 1.10.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/pwngrid + chdir: /usr/local/src/opwngrid when: pwngrid.changed - name: remove pwngrid folder file: state: absent - path: /usr/local/src/pwngrid + path: /usr/local/src/opwngrid - name: download bettercap git: - repo: https://github.com/jayofelony/bettercap.git + repo: "{{ packages.bettercap.source }}" dest: /usr/local/src/bettercap - name: install bettercap 2.32.1 @@ -297,7 +298,7 @@ - name: clone bettercap caplets git: - repo: https://github.com/jayofelony/caplets.git + repo: "{{ packages.caplets.source }}" dest: /tmp/caplets register: capletsgit diff --git a/builder/raspberrypi32.yml b/builder/raspberrypi32.yml index db2c4891..3c47a64b 100644 --- a/builder/raspberrypi32.yml +++ b/builder/raspberrypi32.yml @@ -76,12 +76,15 @@ - triggerhappy.service - wpa_supplicant.service packages: + caplets: + source: "https://github.com/jayofelony/caplets.git" bettercap: + source: "https://github.com/jayofelony/bettercap.git" url: "https://github.com/bettercap/bettercap/releases/download/v2.31.0/bettercap_linux_armhf_v2.31.0.zip" ui: "https://github.com/bettercap/ui/releases/download/v1.3.0/ui.zip" - pwngrid: + opwngrid: source: "https://github.com/jayofelony/pwngrid.git" - url: "https://github.com/rai68/opwngrid/releases/download/publish/pwngrid_linux_armhf_v1.10.3-1.zip" + url: "https://github.com/jayofelony/pwngrid/releases/download/v1.10.4/opwngrid-1.10.4-armhf.zip" torch: wheel: "torch-2.1.0a0+gitunknown-cp39-cp39-linux_armv6l.whl" url: "https://github.com/Sniffleupagus/Torch4Pizero/releases/download/v1.0.0/torch-2.1.0a0+gitunknown-cp39-cp39-linux_armv6l.whl" @@ -393,7 +396,8 @@ - name: download opwngrid 1.10.4 unarchive: - remote_src: "https://github.com/jayofelony/pwngrid/releases/download/v1.10.4/opwngrid-1.10.4-armhf.zip" + remote_src: yes + src: "{{ packages.opwngrid.url }}" dest: /usr/local/bin/ mode: 0755 @@ -409,7 +413,7 @@ - name: clone bettercap caplets git: - repo: https://github.com/jayofelony/caplets.git + repo: "{{ packages.caplets.source }}" dest: /tmp/caplets register: capletsgit diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml index 76876b2d..2d85d2e8 100644 --- a/builder/raspberrypi64.yml +++ b/builder/raspberrypi64.yml @@ -39,12 +39,14 @@ - triggerhappy.service - wpa_supplicant.service packages: + caplets: + source: "https://github.com/jayofelony/caplets.git" bettercap: - # We will install bettercap from source + source: "https://github.com/jayofelony/bettercap.git" url: "https://github.com/jayofelony/bettercap/releases/download/2.32.1/bettercap-2.32.1.zip" ui: "https://github.com/bettercap/ui/releases/download/v1.3.0/ui.zip" - pwngrid: - source: "https://github.com/jayofelony/pwngrid.git" + opwngrid: + source: "https://github.com/jayofelony/opwngrid.git" url: "https://github.com/rai68/opwngrid/releases/download/publish/pwngrid_linux_aarch64_v1.10.3-1.zip" apt: downgrade: @@ -333,25 +335,25 @@ export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin when: golang.changed - - name: download pwngrid 1.10.4 + - name: download opwngrid 1.10.4 git: - repo: https://github.com/jayofelony/pwngrid.git - dest: /usr/local/src/pwngrid + repo: "{{ packages.opwngrid.source }}" + dest: /usr/local/src/opwngrid - - name: install pwngrid 1.10.4 + - name: install opwngrid 1.10.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/pwngrid + chdir: /usr/local/src/opwngrid - - name: remove pwngrid folder + - name: remove opwngrid folder file: state: absent - path: /usr/local/src/pwngrid + path: /usr/local/src/opwngrid - name: download bettercap git: - repo: https://github.com/jayofelony/bettercap.git + repo: "{{ packages.bettercap.source }}" dest: /usr/local/src/bettercap - name: install bettercap 2.32.1 @@ -377,7 +379,7 @@ - name: clone bettercap caplets git: - repo: https://github.com/jayofelony/caplets.git + repo: "{{ packages.caplets.source }}" dest: /tmp/caplets register: capletsgit