allow case-insensitive match of WSL strings

This commit is contained in:
Henry Gabryjelski 2023-02-19 01:44:15 -08:00
commit ce85fe0099

5
pm3
View file

@ -69,7 +69,7 @@ function get_pm3_list_Linux {
fi fi
# WSL2 with usbipd detection - doesn't report same things as WSL1 # WSL2 with usbipd detection - doesn't report same things as WSL1
if grep -q "proxmark.org" "/sys/class/tty/${DEV#/dev/}/../../../manufacturer" 2>/dev/null; then if grep -q "proxmark.org" "/sys/class/tty/${DEV#/dev/}/../../../manufacturer" 2>/dev/null; then
if !( echo "${PM3LIST[*]}" | grep -q "${DEV}" ); then if echo "${PM3LIST[*]}" | grep -qv "${DEV}"; then
PM3LIST+=("$DEV") PM3LIST+=("$DEV")
if [ ${#PM3LIST[*]} -ge "$N" ]; then if [ ${#PM3LIST[*]} -ge "$N" ]; then
return return
@ -475,7 +475,8 @@ fi
HOSTOS=$(uname | awk '{print toupper($0)}') HOSTOS=$(uname | awk '{print toupper($0)}')
if [ "$HOSTOS" = "LINUX" ]; then if [ "$HOSTOS" = "LINUX" ]; then
if uname -a|grep -q Microsoft; then # Detect when running under WSL1 (but exclude WSL2)
if uname -a | grep -qi Microsoft && uname -a | grep -qvi WSL2; then
# First try finding it using the PATH environment variable # First try finding it using the PATH environment variable
PSHEXE=$(command -v powershell.exe 2>/dev/null) PSHEXE=$(command -v powershell.exe 2>/dev/null)