Sync from Upstream

2019-03-15 21:17:07 +01:00
parent ea53e1f981
commit 6a52b6074f
161 changed files with 2002 additions and 1463 deletions
--- a/proxmark3.sh
+++ b/proxmark3.sh
@@ -2,7 +2,7 @@

 function wait4proxmark_Linux {
    echo >&2 "Waiting for Proxmark to appear..."
-    while [ ! -c /dev/ttyACM? -a ! -L /dev/pm3-? ]; do
+    while [ ! -c /dev/ttyACM? -a ! -c /dev/pm3-? ]; do
        sleep .1
    done
    local PM3=`ls -1 /dev/pm3-? /dev/ttyACM? 2>/dev/null | head -1`