Update build for Pi 5 users

Version 2.7.8
This commit is contained in:
Jeroen Oudshoorn
2024-01-24 10:24:01 +01:00
parent dde6fa4c2a
commit 7aacf9fb44
7 changed files with 26 additions and 24 deletions

View File

@ -1 +1 @@
__version__ = '2.7.7'
__version__ = '2.7.8'

View File

@ -92,7 +92,7 @@ def update_data(last_session):
'build': "Pwnagotchi-Torch by Jayofelony",
'plugins': enabled,
'language': language,
'bettercap': subprocess.getoutput("bettercap -version").split(".\n\n")[1],
'bettercap': subprocess.getoutput("bettercap -version"),
'opwngrid': subprocess.getoutput("pwngrid -version")
}

View File

@ -199,7 +199,7 @@ def list_plugins(args, config, pattern='*'):
available_not_installed = set(available.keys()) - set(installed.keys())
max_len_list = available_and_installed if args.installed else available_not_installed
max_len = max(map(len, max_len_list))
max_len = max(map(len, max_len_list)) if max_len_list else 0
header = line.format(name='Plugin', width=max_len, version='Version', enabled='Active', status='Status')
line_length = max(max_len, len('Plugin')) + len(header) - len('Plugin') - 12 # lol

View File

@ -19,6 +19,10 @@ class AircrackOnly(plugins.Plugin):
def __init__(self):
self.text_to_set = ""
self.options = dict()
def on_ready(self):
return
def on_loaded(self):
logging.info("aircrackonly plugin loaded")

View File

@ -130,7 +130,7 @@ def install(display, update):
source_path = "%s-%s" % (source_path, update['available'])
# setup.py is going to install data files for us
os.system("cd %s && pip3 install . --no-cache-dir --break-system-packages" % source_path)
os.system("cd %s && pip3 install . --break-system-packages" % source_path)
return True

View File

@ -131,6 +131,7 @@ class Wigle(plugins.Plugin):
"""
Called in manual mode when there's internet connectivity
"""
global pcap_filename
if not self.ready or self.lock.locked():
return
@ -143,7 +144,7 @@ class Wigle(plugins.Plugin):
all_files = os.listdir(handshake_dir)
all_gps_files = [os.path.join(handshake_dir, filename)
for filename in all_files
if filename.endswith('.gps.json') or filename.endswith('.paw-gps.json') or filename.endswith('.geo.json')]
if filename.endswith('.gps.json') or filename.endswith('.geo.json')]
all_gps_files = remove_whitelisted(all_gps_files, config['main']['whitelist'])
new_gps_files = set(all_gps_files) - set(reported) - set(self.skip)
@ -154,8 +155,6 @@ class Wigle(plugins.Plugin):
for gps_file in new_gps_files:
if gps_file.endswith('.gps.json'):
pcap_filename = gps_file.replace('.gps.json', '.pcap')
if gps_file.endswith('.paw-gps.json'):
pcap_filename = gps_file.replace('.paw-gps.json', '.pcap')
if gps_file.endswith('.geo.json'):
pcap_filename = gps_file.replace('.geo.json', '.pcap')
if not os.path.exists(pcap_filename):