Merge pull request #39 from dracula/mac_spacing

RIP if there are still spacing issues
This commit is contained in:
Dane Williams 2020-05-31 16:43:19 -07:00 committed by GitHub
commit 59c37e1d63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions

View file

@ -83,7 +83,12 @@ main()
{
bat_stat=$(battery_status)
bat_perc=$(battery_percent)
if [ -z "$bat_stat" ]; then # Test if status is empty or not
echo "$bat_perc"
else
echo "$bat_stat $bat_perc"
fi
}
#run main driver program

View file

@ -16,8 +16,8 @@ get_ssid()
;;
Darwin)
if /System/Library/PrivateFrameworks/Apple80211.framework/Resources/airport -I | grep -E ' SSID' | cut -d ':' -f 2 &> /dev/null; then
echo "$(/System/Library/PrivateFrameworks/Apple80211.framework/Resources/airport -I | grep -E ' SSID' | cut -d ':' -f 2)"
if /System/Library/PrivateFrameworks/Apple80211.framework/Resources/airport -I | grep -E ' SSID' | cut -d ':' -f 2 | sed 's/ ^*//g' &> /dev/null; then
echo "$(/System/Library/PrivateFrameworks/Apple80211.framework/Resources/airport -I | grep -E ' SSID' | cut -d ':' -f 2)" | sed 's/ ^*//g'
else
echo 'Ethernet'
fi