diff --git a/login.sh b/login.sh index 2e6154a..a2ac390 100644 --- a/login.sh +++ b/login.sh @@ -15,13 +15,13 @@ elif [ "$LOGIN" = "20" ] echo "${red}Account Locked!${reset}" echo "${lightred}Please reset password and login again.${reset}" echo "" - if [ "$MAC" = "true" ] + if [ "$OS" = "macos" ] then open $BML_RESETPASS - elif [ "$WSL" = "true" ] + elif [ "$OS" = "windows" ] then cmd.exe /C START $BML_RESETPASS - elif [ "$ANDROID" = "true" ] + elif [ "$OS" = "android" ] then am start -a android.intent.action.VIEW -d $BML_RESETPASS else diff --git a/osdetect.sh b/osdetect.sh index d98719d..122ae6a 100644 --- a/osdetect.sh +++ b/osdetect.sh @@ -1,18 +1,19 @@ #!/bin/bash -if [ "uname -r | grep -oE microsoft" = "microsoft" ] || [ "uname -r | grep -oE Microsoft" = "Microsoft" ] || [ "uname -r | grep -oE icrosoft" = "icrosoft" ] +if [ "uname -r | grep -oE microsoft" = "microsoft" ] then - WSL=true - #echo "${red}WSL Not Supported!${reset}" 1>&2 + OS=windows + #echo ${red}WSL Not Supported!${reset} 1>&2 #exit elif [ "uname -a | grep -oE Darwin | tail -n1" = "Darwin" ] then - MAC=true - #echo "${red}MacOS Not Supported!${reset}" 1>&2 + OS=macos + export PATH="/usr/local/opt/openssl@1.1/bin:$PATH" + #echo ${red}MacOS Not Supported!${reset} 1>&2 #exit elif [ "uname -a | grep -oE Android" = "Android" ] then - ANDROID=true + OS=android else : fi