Skip to content

Add system_profiler fallback for newer macOS versions #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add system_profiler fallback for newer macOS versions #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions wifi-password.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,18 @@ args="$@"
if [ "" != "$args" ]; then
ssid="$@"
else
# get current ssid
ssid="`$airport -I | awk '/ SSID/ {print substr($0, index($0, $2))}'`"
# get current ssid with fallback for newer macOS
# try airport (works on older macOS, returns empty on newer)
ssid="`$airport -I 2>/dev/null | awk '/ SSID/ {print substr($0, index($0, $2))}'`"
# if airport returned nothing, fall back to system_profiler
if [ "$ssid" = "" ]; then
ssid="`system_profiler SPAirPortDataType 2>/dev/null | awk -F': ' '/Current Network Information:/{getline; if ($1 ~ /^[ ]+[^ ]+/) {gsub(/^[ ]+|:$/, "", $1); print $1; exit}}'`"
fi
if [ "$ssid" = "" ]; then
echo "ERROR: Could not retrieve current SSID. Are you connected?" >&2
exit 1
fi
fi

# warn user about keychain dialog
if [ $verbose ]; then
echo ""
Expand Down