chrissewell/pwnagotchi
1
0
Fork 0
mirror of https://github.com/jayofelony/pwnagotchi.git synced 2025-07-01 18:37:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Version 2.6.9

Browse Source
This commit is contained in:
Jeroen Oudshoorn
2024-01-14 09:41:39 +01:00
parent b03b3119c7
commit 18217119fc
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/pwnagotchi
View File

@ -172,12 +172,12 @@ def pwnagotchi_cli():
% (pwnagotchi.__version__, latest_ver))
# input validation
if user_input.lower() in ('y', 'yes'):
os.system("rm /root/.auto-update && systemctl restart pwnagotchi")
if os.path.exists('/root/.auto-update'):
os.system("rm /root/.auto-update && systemctl restart pwnagotchi")
os.system("systemctl restart pwnagotchi")
print("Okay, give me a couple minutes. Just watch pwnlog while you wait.")
elif user_input.lower() in ('n', 'no'): # using this elif for readability
print("Okay, guess not!")
else:
print("You are currently on the latest release, v%s." % pwnagotchi.__version__)
print("Okay, guess not!")
print("You are currently on the latest release, v%s." % pwnagotchi.__version__)
sys.exit(0)
config = utils.load_config(args)

2
pwnagotchi/_version.py
View File

@ -1 +1 @@
__version__ = '2.6.8'
__version__ = '2.6.9'

2
pwnagotchi/plugins/default/fix_services.py
View File

@ -105,7 +105,7 @@ class FixServices(plugins.Plugin):
other_last_lines = ''.join(list(TextIOWrapper(subprocess.Popen(['journalctl', '-n10'],
stdout=subprocess.PIPE).stdout))[-10:])
other_other_last_lines = ''.join(
list(TextIOWrapper(subprocess.Popen(['tail', '-n10', '/var/log/pwnagotchi.log'],
list(TextIOWrapper(subprocess.Popen(['tail', '-n10', '/home/pi/logs/pwnagotchi.log'],
stdout=subprocess.PIPE).stdout))[-10:])
# don't check if we ran a reset recently
logging.debug("[Fix_Services]**** epoch")

2
pwnagotchi/plugins/default/memtemp.py
View File

@ -141,7 +141,7 @@ class MemTemp(plugins.Plugin):
elif ui.is_inky():
h_pos = (140, 68)
v_pos = (160, 54)
elif ui.is_waveshare27inch():
elif ui.is_waveshare2in7():
h_pos = (192, 138)
v_pos = (211, 122)
else:

5
pwnagotchi/utils.py
View File

@ -444,7 +444,10 @@ def iface_channels(ifname):
output = subprocess.getoutput("/sbin/iw phy%s channels | grep ' MHz' | grep -v disabled | sed 's/^.*\[//g' | sed s/\].*\$//g" % phy)
for line in output.split("\n"):
line = line.strip()
channels.append(int(line))
try:
channels.append(int(line))
except Exception as e:
pass
return channels