fix: fixes a race condition in the launcher scripts and enables MANU …

…if eth0 is up (closes #365)
evilsocket · Oct 23, 2019 · a78a4b0 · a78a4b0 · ZerxXxes · Oct 23, 2019
1 parent 3ad4269
commit a78a4b0
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
@@ -304,7 +304,7 @@
         # blink 10 times to signal ready state
         /usr/bin/bootblink 10 &
         # start a detached screen session with bettercap
-        if ifconfig | grep usb0 | grep RUNNING; then
+        if [[ ifconfig | grep usb0 | grep RUNNING ]] || [[ $(cat /sys/class/net/eth0/carrier) ]]; then
           # if override file exists, go into auto mode
           if [ -f /root/.pwnagotchi-auto ]; then
             rm /root/.pwnagotchi-auto
@@ -322,13 +322,10 @@
       mode: 0755
       content: |
         #!/usr/bin/env bash
-        # blink 10 times to signal ready state
-        /usr/bin/bootblink 10 &
         /usr/bin/monstart
-        if ifconfig | grep usb0 | grep RUNNING; then
+        if [[ ifconfig | grep usb0 | grep RUNNING ]] || [[ $(cat /sys/class/net/eth0/carrier) ]]; then
           # if override file exists, go into auto mode
           if [ -f /root/.pwnagotchi-auto ]; then
-            rm /root/.pwnagotchi-auto
             /usr/bin/bettercap -no-colors -caplet pwnagotchi-auto -iface mon0
           else
             /usr/bin/bettercap -no-colors -caplet pwnagotchi-manual -iface mon0