Version 2.6.9

bin/pwnagotchi

@@ -172,11 +172,11 @@ def pwnagotchi_cli():
                                % (pwnagotchi.__version__, latest_ver))
             # input validation
             if user_input.lower() in ('y', 'yes'):
+                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__)
         sys.exit(0)
 

pwnagotchi/_version.py

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

pwnagotchi/plugins/default/fix_services.py

@@ -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")

pwnagotchi/plugins/default/memtemp.py

@@ -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:

pwnagotchi/utils.py

@@ -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()
+        try:
             channels.append(int(line))
+        except Exception as e:
+            pass
     return channels