diff --git a/builder/data/32bit/etc/bash_completion.d/pwnagotchi_completion.sh b/builder/data/32bit/etc/bash_completion.d/pwnagotchi_completion.sh deleted file mode 100644 index 8424a534..00000000 --- a/builder/data/32bit/etc/bash_completion.d/pwnagotchi_completion.sh +++ /dev/null @@ -1,36 +0,0 @@ -_show_complete() -{ - local cur opts node_names all_options opt_line - all_options=" -pwnagotchi -h --help -C --config -U --user-config --manual --skip-session --clear --debug --version --print-config --check-update --donate {plugins,google} -pwnagotchi plugins -h --help {list,install,enable,disable,uninstall,update,upgrade} -pwnagotchi plugins list -i --installed -h --help -pwnagotchi plugins install -h --help -pwnagotchi plugins uninstall -h --help -pwnagotchi plugins enable -h --help -pwnagotchi plugins disable -h --help -pwnagotchi plugins update -h --help -pwnagotchi plugins upgrade -h --help -pwnagotchi google -h --help {login,refresh} -pwnagotchi google login -h --help -pwnagotchi google refresh -h --help -" - COMPREPLY=() - cur="${COMP_WORDS[COMP_CWORD]}" - # shellcheck disable=SC2124 - cmd="${COMP_WORDS[@]:0:${#COMP_WORDS[@]}-1}" - opt_line="$(grep -m1 "$cmd" <<<"$all_options")" - if [[ ${cur} == -* ]] ; then - opts="$(echo "$opt_line" | tr ' ' '\n' | awk '/^ *-/{gsub("[^a-zA-Z0-9-]","",$1);print $1}')" - # shellcheck disable=SC2207 - COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) - return 0 - fi - - # shellcheck disable=SC2086 - opts="$(echo $opt_line | grep -Po '{\K[^}]+' | tr ',' '\n')" - # shellcheck disable=SC2207 - COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) -} - -complete -F _show_complete pwnagotchi diff --git a/builder/data/32bit/etc/profile b/builder/data/32bit/etc/profile deleted file mode 100644 index f7ef2f2a..00000000 --- a/builder/data/32bit/etc/profile +++ /dev/null @@ -1,40 +0,0 @@ -# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) -# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). - -if [ "$(id -u)" -eq 0 ]; then - PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" -else - PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/games:/usr/games" -fi -export PATH - -if [ "${PS1-}" ]; then - if [ "${BASH-}" ] && [ "$BASH" != "/bin/sh" ]; then - # The file bash.bashrc already sets the default PS1. - # PS1='\h:\w\$ ' - if [ -f /etc/bash.bashrc ]; then - . /etc/bash.bashrc - fi - else - if [ "$(id -u)" -eq 0 ]; then - PS1='# ' - else - PS1='$ ' - fi - fi -fi - -if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/*.sh; do - if [ -r $i ]; then - . $i - fi - done - unset i -fi -alias custom='cd /usr/local/share/pwnagotchi/custom-plugins/' -alias config='sudo nano /etc/pwnagotchi/config.toml' -alias pwnlog='tail -f -n300 /etc/pwnagotchi/log/pwnagotchi.log | sed --unbuffered "s/,[[:digit:]]\\{3\\}\\]//g" | cut -d " " -f 2-' -alias pwnver='python3 -c "import pwnagotchi as p; print(p.__version__)"' -alias pwnkill='sudo killall -USR1 pwnagotchi' - diff --git a/builder/data/32bit/etc/systemd/system/pwnagotchi.service b/builder/data/32bit/etc/systemd/system/pwnagotchi.service deleted file mode 100644 index b48f7dfe..00000000 --- a/builder/data/32bit/etc/systemd/system/pwnagotchi.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=pwnagotchi Deep Reinforcement Learning instrumenting bettercap for WiFI pwning. -Documentation=https://pwnagotchi.ai -Wants=network.target -After=pwngrid-peer.service - -[Service] -Type=simple -WorkingDirectory=~ -ExecStart=/usr/bin/pwnagotchi-launcher -Restart=always -RestartSec=30 -TasksMax=infinity -LimitNPROC=infinity -StandardOutput=null -StandardError=null - -[Install] -WantedBy=multi-user.target diff --git a/builder/data/32bit/etc/update-motd.d/01-motd b/builder/data/32bit/etc/update-motd.d/01-motd deleted file mode 100755 index 1a9e3e82..00000000 --- a/builder/data/32bit/etc/update-motd.d/01-motd +++ /dev/null @@ -1,34 +0,0 @@ -#!/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 " All plugin config files are located in /etc/pwnagotchi/conf.d/" -echo " Read the readme if you want to use gdrivesync plugin!!" -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 --wizard, to help set up a config.toml" -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 " sudo systemctl status pwnagotchi" -echo -echo " You can restart me using" -echo " pwnkill" -echo -echo " You can learn more about me at https://pwnagotchi.org/" \ No newline at end of file diff --git a/builder/data/32bit/usr/bin/bettercap-launcher b/builder/data/32bit/usr/bin/bettercap-launcher deleted file mode 100755 index 5b154b15..00000000 --- a/builder/data/32bit/usr/bin/bettercap-launcher +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash -source /usr/bin/pwnlib - -# we need to decrypt something -if is_crypted_mode; then - while ! is_decrypted; do - echo "Waiting for decryption..." - sleep 1 - done -fi - -# check if wifi driver is bugged -if ! check_brcm; then - if ! reload_brcm; then - echo "Could not reload wifi driver. Reboot" - reboot - fi - sleep 10 -fi - -if is_auto_mode_no_delete; then - /usr/local/bin/bettercap -no-colors -caplet pwnagotchi-auto -iface wlan0mon -else - /usr/local/bin/bettercap -no-colors -caplet pwnagotchi-manual -iface wlan0mon -fi diff --git a/builder/data/32bit/usr/bin/decryption-webserver b/builder/data/32bit/usr/bin/decryption-webserver deleted file mode 100755 index cbd4633c..00000000 --- a/builder/data/32bit/usr/bin/decryption-webserver +++ /dev/null @@ -1,149 +0,0 @@ -#!/usr/bin/env python3 - -from http.server import HTTPServer, BaseHTTPRequestHandler -from urllib.parse import parse_qsl - - -_HTML_FORM_TEMPLATE = """ - - - - Decryption - - - -
-

Decryption

-

Some of your files are encrypted.

-

Please provide the decryption password.

-
-
- {password_fields} - -
-
-
- - -""" - -POST_RESPONSE = """ - - - - - - - - - -
- - - -""" - -HTML_FORM = None - - -class SimpleHTTPRequestHandler(BaseHTTPRequestHandler): - - def do_GET(self): - self.send_response(200) - self.end_headers() - self.wfile.write(HTML_FORM.encode()) - - def do_POST(self): - content_length = int(self.headers['Content-Length']) - body = self.rfile.read(content_length) - for mapping, password in parse_qsl(body.decode('UTF-8')): - with open('/tmp/.pwnagotchi-secret-{}'.format(mapping), 'wt') as pwfile: - pwfile.write(password) - self.send_response(200) - self.end_headers() - self.wfile.write(POST_RESPONSE.encode()) - - -with open('/root/.pwnagotchi-crypted') as crypted_file: - mappings = [line.split()[0] for line in crypted_file.readlines()] - fields = ''.join(['\n
'.format(m=m) - for m in mappings]) - HTML_FORM = _HTML_FORM_TEMPLATE.format(password_fields=fields) - -httpd = HTTPServer(('0.0.0.0', 80), SimpleHTTPRequestHandler) -httpd.serve_forever() diff --git a/builder/data/32bit/usr/bin/pwnagotchi-launcher b/builder/data/32bit/usr/bin/pwnagotchi-launcher deleted file mode 100755 index d9d8b885..00000000 --- a/builder/data/32bit/usr/bin/pwnagotchi-launcher +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash -source /usr/bin/pwnlib - -# we need to decrypt something -if is_crypted_mode; then - while ! is_decrypted; do - echo "Waiting for decryption..." - sleep 1 - done -fi - -if is_auto_mode; then - /usr/local/bin/pwnagotchi - systemctl restart bettercap -else - /usr/local/bin/pwnagotchi --manual -fi diff --git a/builder/data/32bit/usr/bin/pwnlib b/builder/data/32bit/usr/bin/pwnlib deleted file mode 100755 index 45b875c6..00000000 --- a/builder/data/32bit/usr/bin/pwnlib +++ /dev/null @@ -1,184 +0,0 @@ -#!/usr/bin/env bash - -# check if brcm is stuck -check_brcm() { - if [[ "$(journalctl -n10 -k --since -5m | grep -c 'brcmf_cfg80211_nexmon_set_channel.*Set Channel failed')" -ge 5 ]]; then - return 1 - fi - return 0 -} - -# reload mod -reload_brcm() { - if ! modprobe -r brcmfmac; then - return 1 - fi - sleep 1 - if ! modprobe brcmfmac; then - return 1 - fi - sleep 2 - iw dev wlan0 set power_save off - return 0 -} - -# starts mon0 -start_monitor_interface() { - rfkill unblock all - ifconfig wlan0 up - iw dev wlan0 set power_save off - iw phy "$(iw phy | head -1 | cut -d" " -f2)" interface add wlan0mon type monitor - rfkill unblock all - ifconfig wlan0 down - ifconfig wlan0mon up - iw dev wlan0mon set power_save off -} - -# stops mon0 -stop_monitor_interface() { - ifconfig wlan0mon down && iw dev wlan0mon del - reload_brcm - ifconfig wlan0 up -} - -# returns 0 if the specificed network interface is up -is_interface_up() { - if grep -qi 'up' /sys/class/net/"$1"/operstate; then - return 0 - fi - return 1 -} - -# returns 0 if conditions for AUTO mode are met -is_auto_mode() { - # check override file first - if [ -f /root/.pwnagotchi-manual ]; then - # remove the override file if found - rm -rf /root/.pwnagotchi-manual - return 1 - fi - - # check override file first - if [ -f /root/.pwnagotchi-auto ]; then - # remove the override file if found - rm -rf /root/.pwnagotchi-auto - return 0 - fi - - # if usb0 is up, we're in MANU - if is_interface_up usb0; then - return 1 - fi - - # if eth0 is up (for other boards), we're in MANU - if is_interface_up eth0; then - return 0 - fi - - # no override, but none of the interfaces is up -> AUTO - return 0 -} - -# returns 0 if conditions for AUTO mode are met -is_auto_mode_no_delete() { - # check override file first - if [ -f /root/.pwnagotchi-manual ]; then - return 1 - fi - - # check override file first - if [ -f /root/.pwnagotchi-auto ]; then - return 0 - fi - - # if usb0 is up, we're in MANU - if is_interface_up usb0; then - return 1 - fi - - # if eth0 is up (for other boards), we're in MANU - if is_interface_up eth0; then - return 0 - fi - - # no override, but none of the interfaces is up -> AUTO - return 0 -} - -# check if we need to decrypt something -is_crypted_mode() { - if [ -f /root/.pwnagotchi-crypted ]; then - return 0 - fi - return 1 -} - -# decryption loop -is_decrypted() { - while read -r mapping container mount; do - # mapping = name the device or file will be mapped to - # container = the luks encrypted device or file - # mount = the mountpoint - - # fail if not mounted - if ! mountpoint -q "$mount" >/dev/null 2>&1; then - if [ -f /tmp/.pwnagotchi-secret-"$mapping" ]; then - /dev/null 2>&1; then - echo "Container decrypted!" - fi - fi - - if mount /dev/mapper/"$mapping" "$mount" >/dev/null 2>&1; then - echo "Mounted /dev/mapper/$mapping to $mount" - continue - fi - fi - - if ! ip -4 addr show wlan0 | grep inet >/dev/null 2>&1; then - >/dev/null 2>&1 ip addr add 192.168.0.10/24 dev wlan0 - fi - - if ! pgrep -f decryption-webserver >/dev/null 2>&1; then - >/dev/null 2>&1 decryption-webserver & - fi - - if ! pgrep wpa_supplicant >/dev/null 2>&1; then - >/tmp/wpa_supplicant.conf cat </dev/null 2>&1 wpa_supplicant -u -s -O -D nl80211 -i wlan0 -c /tmp/wpa_supplicant.conf & - fi - - if ! pgrep dnsmasq >/dev/null 2>&1; then - >/dev/null 2>&1 dnsmasq -k -p 53 -h -O "6,192.168.0.10" -A "/#/192.168.0.10" -i wlan0 -K -F 192.168.0.50,192.168.0.60,255.255.255.0,24h & - fi - - return 1 - fi - done /dev/null - # delete - rm /tmp/.pwnagotchi-secret-* - sync # flush - - pkill wpa_supplicant - pkill dnsmasq - pid="$(pgrep -f "decryption-webserver")" - [[ -n "$pid" ]] && kill "$pid" - - return 0 -} diff --git a/builder/data/64bit/etc/NetworkManager/NetworkManager.conf b/builder/data/64bit/etc/NetworkManager/NetworkManager.conf deleted file mode 100644 index 3d2022a5..00000000 --- a/builder/data/64bit/etc/NetworkManager/NetworkManager.conf +++ /dev/null @@ -1,5 +0,0 @@ -[main] -plugins=keyfile,ifupdown - -[ifupdown] -managed=true diff --git a/builder/data/64bit/etc/dphys-swapfile b/builder/data/64bit/etc/dphys-swapfile deleted file mode 100644 index 1c908a10..00000000 --- a/builder/data/64bit/etc/dphys-swapfile +++ /dev/null @@ -1,26 +0,0 @@ -# /etc/dphys-swapfile - user settings for dphys-swapfile package -# author Neil Franklin, last modification 2010.05.05 -# copyright ETH Zuerich Physics Departement -# use under either modified/non-advertising BSD or GPL license - -# this file is sourced with . so full normal sh syntax applies - -# the default settings are added as commented out CONF_*=* lines - - -# where we want the swapfile to be, this is the default -#CONF_SWAPFILE=/var/swap - -# set size to absolute value, leaving empty (default) then uses computed value -# you most likely don't want this, unless you have an special disk situation -CONF_SWAPSIZE=2048 - -# set size to computed value, this times RAM size, dynamically adapts, -# guarantees that there is enough swap without wasting disk space on excess -#CONF_SWAPFACTOR=2 - -# restrict size (computed and absolute!) to maximally this limit -# can be set to empty for no limit, but beware of filled partitions! -# this is/was a (outdated?) 32bit kernel limit (in MBytes), do not overrun it -# but is also sensible on 64bit to prevent filling /var or even / partition -#CONF_MAXSWAP=2048 \ No newline at end of file diff --git a/builder/data/64bit/etc/modules-load.d/modules.conf b/builder/data/64bit/etc/modules-load.d/modules.conf deleted file mode 100644 index bb4fa86c..00000000 --- a/builder/data/64bit/etc/modules-load.d/modules.conf +++ /dev/null @@ -1,6 +0,0 @@ -# /etc/modules: kernel modules to load at boot time. -# -# This file contains the names of kernel modules that should be loaded -# at boot time, one per line. Lines beginning with "#" are ignored. -# Parameters can be specified after the module name. -i2c-dev \ No newline at end of file diff --git a/builder/data/64bit/etc/network/interfaces.d/eth0-cfg b/builder/data/64bit/etc/network/interfaces.d/eth0-cfg deleted file mode 100644 index 2166051a..00000000 --- a/builder/data/64bit/etc/network/interfaces.d/eth0-cfg +++ /dev/null @@ -1,2 +0,0 @@ -allow-hotplug eth0 -iface eth0 inet dhcp \ No newline at end of file diff --git a/builder/data/64bit/etc/network/interfaces.d/lo-cfg b/builder/data/64bit/etc/network/interfaces.d/lo-cfg deleted file mode 100644 index 18ff4764..00000000 --- a/builder/data/64bit/etc/network/interfaces.d/lo-cfg +++ /dev/null @@ -1,2 +0,0 @@ -auto lo -iface lo inet loopback \ No newline at end of file diff --git a/builder/data/64bit/etc/network/interfaces.d/usb0-cfg b/builder/data/64bit/etc/network/interfaces.d/usb0-cfg deleted file mode 100644 index 3521780a..00000000 --- a/builder/data/64bit/etc/network/interfaces.d/usb0-cfg +++ /dev/null @@ -1,8 +0,0 @@ -allow-hotplug usb0 -iface usb0 inet static - address 10.0.0.2 - netmask 255.255.255.0 - network 10.0.0.0 - broadcast 10.0.0.255 - gateway 10.0.0.1 - metric 101 diff --git a/builder/data/64bit/etc/network/interfaces.d/wlan0-cfg b/builder/data/64bit/etc/network/interfaces.d/wlan0-cfg deleted file mode 100644 index f5425694..00000000 --- a/builder/data/64bit/etc/network/interfaces.d/wlan0-cfg +++ /dev/null @@ -1,2 +0,0 @@ -allow-hotplug wlan0 -iface wlan0 inet static \ No newline at end of file diff --git a/builder/data/64bit/etc/profile b/builder/data/64bit/etc/profile deleted file mode 100644 index f7ef2f2a..00000000 --- a/builder/data/64bit/etc/profile +++ /dev/null @@ -1,40 +0,0 @@ -# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) -# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). - -if [ "$(id -u)" -eq 0 ]; then - PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" -else - PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/games:/usr/games" -fi -export PATH - -if [ "${PS1-}" ]; then - if [ "${BASH-}" ] && [ "$BASH" != "/bin/sh" ]; then - # The file bash.bashrc already sets the default PS1. - # PS1='\h:\w\$ ' - if [ -f /etc/bash.bashrc ]; then - . /etc/bash.bashrc - fi - else - if [ "$(id -u)" -eq 0 ]; then - PS1='# ' - else - PS1='$ ' - fi - fi -fi - -if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/*.sh; do - if [ -r $i ]; then - . $i - fi - done - unset i -fi -alias custom='cd /usr/local/share/pwnagotchi/custom-plugins/' -alias config='sudo nano /etc/pwnagotchi/config.toml' -alias pwnlog='tail -f -n300 /etc/pwnagotchi/log/pwnagotchi.log | sed --unbuffered "s/,[[:digit:]]\\{3\\}\\]//g" | cut -d " " -f 2-' -alias pwnver='python3 -c "import pwnagotchi as p; print(p.__version__)"' -alias pwnkill='sudo killall -USR1 pwnagotchi' - diff --git a/builder/data/64bit/etc/rc.local b/builder/data/64bit/etc/rc.local deleted file mode 100644 index da315cff..00000000 --- a/builder/data/64bit/etc/rc.local +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -e -# -# rc.local -# -# This script is executed at the end of each multiuser runlevel. -# Make sure that the script will "exit 0" on success or any other -# value on error. -# -# In order to enable or disable this script just change the execution -# bits. -# -# By default this script does nothing. - -timedatectl set-ntp true - -exit 0 \ No newline at end of file diff --git a/builder/data/64bit/etc/systemd/system/bettercap.service b/builder/data/64bit/etc/systemd/system/bettercap.service deleted file mode 100644 index ce8e8290..00000000 --- a/builder/data/64bit/etc/systemd/system/bettercap.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=bettercap api.rest service. -Documentation=https://bettercap.org -Wants=network.target - -[Service] -Type=simple -ExecStart=/usr/bin/bettercap-launcher -Restart=always -RestartSec=30 - -[Install] -WantedBy=multi-user.target diff --git a/builder/data/64bit/etc/systemd/system/bluetooth.service b/builder/data/64bit/etc/systemd/system/bluetooth.service deleted file mode 100644 index 6780e4b8..00000000 --- a/builder/data/64bit/etc/systemd/system/bluetooth.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=Bluetooth service -Documentation=man:bluetoothd(8) -ConditionPathIsDirectory=/sys/class/bluetooth - -[Service] -Type=dbus -BusName=org.bluez -ExecStart=/usr/libexec/bluetooth/bluetoothd --noplugin=sap,a2dp -NotifyAccess=main -#WatchdogSec=10 -#Restart=on-failure -CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE -LimitNPROC=1 -ProtectHome=true -ProtectSystem=full - -[Install] -WantedBy=bluetooth.target -Alias=dbus-org.bluez.service diff --git a/builder/data/64bit/etc/systemd/system/pwngrid-peer.service b/builder/data/64bit/etc/systemd/system/pwngrid-peer.service deleted file mode 100644 index 9a55eb3f..00000000 --- a/builder/data/64bit/etc/systemd/system/pwngrid-peer.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=pwngrid peer service. -Documentation=https://pwnagotchi.ai -Wants=network.target -After=bettercap.service - -[Service] -Environment=LD_PRELOAD=/usr/local/lib/libpcap.so.1 -Environment=LD_LIBRARY_PATH=/usr/local/lib -Type=simple -ExecStart=/usr/local/bin/pwngrid -keys /etc/pwnagotchi -peers /root/peers -address 127.0.0.1:8666 -client-token /root/.api-enrollment.json -wait -log /etc/pwnagotchi/log/pwngrid-peer.log -iface wlan0mon -Restart=always -RestartSec=30 - -[Install] -WantedBy=multi-user.target diff --git a/builder/data/64bit/root/client_secrets.json b/builder/data/64bit/root/client_secrets.json deleted file mode 100644 index e69de29b..00000000 diff --git a/builder/data/64bit/root/settings.yaml b/builder/data/64bit/root/settings.yaml deleted file mode 100644 index 5f198bde..00000000 --- a/builder/data/64bit/root/settings.yaml +++ /dev/null @@ -1,15 +0,0 @@ -client_config_backend: file -client_config_file: /root/client_secrets.json -client_config: - client_id: - client_secret: - -save_credentials: True -save_credentials_backend: file -save_credentials_file: /root/credentials.json - -get_refresh_token: True - -oauth_scope: - - https://www.googleapis.com/auth/drive - - https://www.googleapis.com/auth/drive.install \ No newline at end of file diff --git a/builder/data/64bit/usr/bin/hdmioff b/builder/data/64bit/usr/bin/hdmioff deleted file mode 100755 index 5c32d62c..00000000 --- a/builder/data/64bit/usr/bin/hdmioff +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -sudo /usr/bin/tvservice -o \ No newline at end of file diff --git a/builder/data/64bit/usr/bin/hdmion b/builder/data/64bit/usr/bin/hdmion deleted file mode 100755 index eec440fc..00000000 --- a/builder/data/64bit/usr/bin/hdmion +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -sudo /usr/bin/tvservice -p \ No newline at end of file diff --git a/builder/data/64bit/usr/bin/monstart b/builder/data/64bit/usr/bin/monstart deleted file mode 100755 index 4c00a5c5..00000000 --- a/builder/data/64bit/usr/bin/monstart +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -source /usr/bin/pwnlib -start_monitor_interface diff --git a/builder/data/64bit/usr/bin/monstop b/builder/data/64bit/usr/bin/monstop deleted file mode 100755 index c90a3aef..00000000 --- a/builder/data/64bit/usr/bin/monstop +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -source /usr/bin/pwnlib -stop_monitor_interface \ No newline at end of file diff --git a/builder/data/32bit/etc/NetworkManager/NetworkManager.conf b/builder/data/etc/NetworkManager/NetworkManager.conf similarity index 100% rename from builder/data/32bit/etc/NetworkManager/NetworkManager.conf rename to builder/data/etc/NetworkManager/NetworkManager.conf diff --git a/builder/data/64bit/etc/bash_completion.d/pwnagotchi_completion.sh b/builder/data/etc/bash_completion.d/pwnagotchi_completion.sh similarity index 100% rename from builder/data/64bit/etc/bash_completion.d/pwnagotchi_completion.sh rename to builder/data/etc/bash_completion.d/pwnagotchi_completion.sh diff --git a/builder/data/32bit/etc/dphys-swapfile b/builder/data/etc/dphys-swapfile similarity index 100% rename from builder/data/32bit/etc/dphys-swapfile rename to builder/data/etc/dphys-swapfile diff --git a/builder/data/32bit/etc/modules-load.d/modules.conf b/builder/data/etc/modules-load.d/modules.conf similarity index 100% rename from builder/data/32bit/etc/modules-load.d/modules.conf rename to builder/data/etc/modules-load.d/modules.conf diff --git a/builder/data/32bit/etc/network/interfaces.d/eth0-cfg b/builder/data/etc/network/interfaces.d/eth0-cfg similarity index 100% rename from builder/data/32bit/etc/network/interfaces.d/eth0-cfg rename to builder/data/etc/network/interfaces.d/eth0-cfg diff --git a/builder/data/32bit/etc/network/interfaces.d/lo-cfg b/builder/data/etc/network/interfaces.d/lo-cfg similarity index 100% rename from builder/data/32bit/etc/network/interfaces.d/lo-cfg rename to builder/data/etc/network/interfaces.d/lo-cfg diff --git a/builder/data/32bit/etc/network/interfaces.d/usb0-cfg b/builder/data/etc/network/interfaces.d/usb0-cfg similarity index 100% rename from builder/data/32bit/etc/network/interfaces.d/usb0-cfg rename to builder/data/etc/network/interfaces.d/usb0-cfg diff --git a/builder/data/32bit/etc/network/interfaces.d/wlan0-cfg b/builder/data/etc/network/interfaces.d/wlan0-cfg similarity index 100% rename from builder/data/32bit/etc/network/interfaces.d/wlan0-cfg rename to builder/data/etc/network/interfaces.d/wlan0-cfg diff --git a/builder/data/32bit/etc/rc.local b/builder/data/etc/rc.local similarity index 100% rename from builder/data/32bit/etc/rc.local rename to builder/data/etc/rc.local diff --git a/builder/data/32bit/etc/systemd/system/bettercap.service b/builder/data/etc/systemd/system/bettercap.service similarity index 100% rename from builder/data/32bit/etc/systemd/system/bettercap.service rename to builder/data/etc/systemd/system/bettercap.service diff --git a/builder/data/32bit/etc/systemd/system/bluetooth.service b/builder/data/etc/systemd/system/bluetooth.service similarity index 100% rename from builder/data/32bit/etc/systemd/system/bluetooth.service rename to builder/data/etc/systemd/system/bluetooth.service diff --git a/builder/data/64bit/etc/systemd/system/pwnagotchi.service b/builder/data/etc/systemd/system/pwnagotchi.service similarity index 100% rename from builder/data/64bit/etc/systemd/system/pwnagotchi.service rename to builder/data/etc/systemd/system/pwnagotchi.service diff --git a/builder/data/32bit/etc/systemd/system/pwngrid-peer.service b/builder/data/etc/systemd/system/pwngrid-peer.service similarity index 100% rename from builder/data/32bit/etc/systemd/system/pwngrid-peer.service rename to builder/data/etc/systemd/system/pwngrid-peer.service diff --git a/builder/data/64bit/etc/update-motd.d/01-motd b/builder/data/etc/update-motd.d/01-motd similarity index 100% rename from builder/data/64bit/etc/update-motd.d/01-motd rename to builder/data/etc/update-motd.d/01-motd diff --git a/builder/data/32bit/root/client_secrets.json b/builder/data/root/client_secrets.json similarity index 100% rename from builder/data/32bit/root/client_secrets.json rename to builder/data/root/client_secrets.json diff --git a/builder/data/32bit/root/settings.yaml b/builder/data/root/settings.yaml similarity index 100% rename from builder/data/32bit/root/settings.yaml rename to builder/data/root/settings.yaml diff --git a/builder/data/64bit/usr/bin/bettercap-launcher b/builder/data/usr/bin/bettercap-launcher similarity index 100% rename from builder/data/64bit/usr/bin/bettercap-launcher rename to builder/data/usr/bin/bettercap-launcher diff --git a/builder/data/64bit/usr/bin/decryption-webserver b/builder/data/usr/bin/decryption-webserver similarity index 100% rename from builder/data/64bit/usr/bin/decryption-webserver rename to builder/data/usr/bin/decryption-webserver diff --git a/builder/data/32bit/usr/bin/hdmioff b/builder/data/usr/bin/hdmioff similarity index 100% rename from builder/data/32bit/usr/bin/hdmioff rename to builder/data/usr/bin/hdmioff diff --git a/builder/data/32bit/usr/bin/hdmion b/builder/data/usr/bin/hdmion similarity index 100% rename from builder/data/32bit/usr/bin/hdmion rename to builder/data/usr/bin/hdmion diff --git a/builder/data/32bit/usr/bin/monstart b/builder/data/usr/bin/monstart similarity index 100% rename from builder/data/32bit/usr/bin/monstart rename to builder/data/usr/bin/monstart diff --git a/builder/data/32bit/usr/bin/monstop b/builder/data/usr/bin/monstop similarity index 100% rename from builder/data/32bit/usr/bin/monstop rename to builder/data/usr/bin/monstop diff --git a/builder/data/64bit/usr/bin/pwnagotchi-launcher b/builder/data/usr/bin/pwnagotchi-launcher similarity index 100% rename from builder/data/64bit/usr/bin/pwnagotchi-launcher rename to builder/data/usr/bin/pwnagotchi-launcher diff --git a/builder/data/64bit/usr/bin/pwnlib b/builder/data/usr/bin/pwnlib similarity index 100% rename from builder/data/64bit/usr/bin/pwnlib rename to builder/data/usr/bin/pwnlib diff --git a/pwnagotchi/ai/gym.py b/pwnagotchi/ai/gym.py index ecd9ecdc..55153aed 100644 --- a/pwnagotchi/ai/gym.py +++ b/pwnagotchi/ai/gym.py @@ -51,7 +51,7 @@ class Environment(gym.Env): 'state_v': None } - self.action_space = spaces.MultiDiscrete([p.space_size() for p in Environment.params if p.trainable]) + self.action_space = spaces.multi_discrete.MultiDiscrete([p.space_size() for p in Environment.params if p.trainable]) self.observation_space = spaces.Box(low=0, high=1, shape=featurizer.shape, dtype=np.float32) self.reward_range = reward.range diff --git a/pwnagotchi/locale/is/LC_MESSAGES/voice.po b/pwnagotchi/locale/is/LC_MESSAGES/voice.po index 0cfe9537..0f0bf4d2 100644 --- a/pwnagotchi/locale/is/LC_MESSAGES/voice.po +++ b/pwnagotchi/locale/is/LC_MESSAGES/voice.po @@ -8,13 +8,13 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-09-24 21:50+0100\n" +"POT-Creation-Date: 2024-11-17 20:51+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: Icelandic\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" msgid "ZzzzZZzzzzZzzz" @@ -201,10 +201,22 @@ msgstr "þú hefur {count} ný skilaboð!" msgid "Oops, something went wrong ... Rebooting ..." msgstr "Oops, eitthvað brotnaði ... Endurræsi ..." +#, python-brace-format +msgid "Uploading data to {to} ..." +msgstr "Hleð upp gögnum til {to} ..." + +#, fuzzy, python-brace-format +msgid "Downloading from {name} ..." +msgstr "Hleð upp gögnum til {to} ..." + #, python-brace-format msgid "Kicked {num} stations\n" msgstr "Sparkaði {num} stöðvar\n" +#, fuzzy +msgid "Made >999 new friends\n" +msgstr "Eignaðist {num} nýja vini\n" + #, python-brace-format msgid "Made {num} new friends\n" msgstr "Eignaðist {num} nýja vini\n" @@ -226,9 +238,10 @@ msgid "" "{associated} new friends and ate {handshakes} handshakes! #pwnagotchi " "#pwnlog #pwnlife #hacktheplanet #skynet" msgstr "" -"Ég hef verið að pwna í {duration} og sparkað {deauthed} viðskiptavinum! Ég hef líka hitt " -"{associated} nýja vini og borðað {handshakes} handabönd! #pwnagotchi " -"#pwnlog #pwnlife #hacktheplanet #skynet" +"Ég hef verið að pwna í {duration} og sparkað {deauthed} viðskiptavinum! Ég " +"hef líka hitt {associated} nýja vini og borðað {handshakes} handabönd! " +"#pwnagotchi #pwnlog #pwnlife #hacktheplanet #skynet" + msgid "hours" msgstr "klukkustundir" @@ -246,7 +259,3 @@ msgstr "mínútu" msgid "second" msgstr "sekúndu" - -#, python-brace-format -msgid "Uploading data to {to} ..." -msgstr "Hleð upp gögnum til {to} ..." diff --git a/pwnagotchi/locale/voice.pot b/pwnagotchi/locale/voice.pot index a8a46eea..a0b4113e 100644 --- a/pwnagotchi/locale/voice.pot +++ b/pwnagotchi/locale/voice.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-16 15:26-0300\n" +"POT-Creation-Date: 2024-11-17 20:51+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/setup.py b/setup.py index 343725e8..f236dc4e 100644 --- a/setup.py +++ b/setup.py @@ -41,10 +41,7 @@ def install_system_files(): os.system(f"apt-get install -y {x}") f.close() setup_path = os.path.dirname(__file__) - if platform.machine().startswith('arm'): - data_path = os.path.join(setup_path, "builder/data/32bit") - elif platform.machine().startswith('aarch'): - data_path = os.path.join(setup_path, "builder/data/64bit") + data_path = os.path.join(setup_path, "builder/data") for source_filename in glob.glob("%s/**" % data_path, recursive=True): if os.path.isfile(source_filename):