From 99a6fc07708eeba4752afdc5e7c73f2dc9c97ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sat, 24 Dec 2022 04:17:04 +0100 Subject: [PATCH 1/7] fixed network module for macOS --- neofetch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/neofetch b/neofetch index f2e99ee3..cd823519 100755 --- a/neofetch +++ b/neofetch @@ -3286,6 +3286,16 @@ get_network() { fi done < <(find /sys/class/net/ -type l) ;; + "Mac OS X"|"macOS") + ActiveNetwork=$(route get default | grep interface | awk '{print $2}') + ActiveNetworkName=$(networksetup -listallhardwareports | grep -B 1 "$ActiveNetwork" | awk '/Hardware Port/{ print }'|cut -d " " -f3-) + if [[ $ActiveNetworkName == "Wi-Fi" ]]; then + LinkSpeed="$(/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -I | awk '/maxRate/{ print }' | xargs | cut -d " " -f2)Mbps" + else + LinkSpeed="$(ifconfig $ActiveNetwork | grep 'media:' | gsed -E "s/.*\((.*)\).*/\1/gm")" + fi + network="$ActiveNetwork: $ActiveNetworkName@$LinkSpeed" + ;; esac while IFS=' ' read -r n i; do if [ -n "$i" ]; then From c2bac01778ac97df043bcac1e169a68733009827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sat, 24 Dec 2022 04:20:47 +0100 Subject: [PATCH 2/7] use awk instead --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index cd823519..556b881d 100755 --- a/neofetch +++ b/neofetch @@ -3292,7 +3292,7 @@ get_network() { if [[ $ActiveNetworkName == "Wi-Fi" ]]; then LinkSpeed="$(/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -I | awk '/maxRate/{ print }' | xargs | cut -d " " -f2)Mbps" else - LinkSpeed="$(ifconfig $ActiveNetwork | grep 'media:' | gsed -E "s/.*\((.*)\).*/\1/gm")" + LinkSpeed="$(ifconfig $ActiveNetwork | awk '/media/{ print }' | gsed -E "s/.*\((.*)\).*/\1/gm")" fi network="$ActiveNetwork: $ActiveNetworkName@$LinkSpeed" ;; From f3bdeb2d300ae35529cf8d99f84748a1975e69bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sat, 24 Dec 2022 04:34:28 +0100 Subject: [PATCH 3/7] fixes --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 556b881d..7f6ae154 100755 --- a/neofetch +++ b/neofetch @@ -3288,11 +3288,11 @@ get_network() { ;; "Mac OS X"|"macOS") ActiveNetwork=$(route get default | grep interface | awk '{print $2}') - ActiveNetworkName=$(networksetup -listallhardwareports | grep -B 1 "$ActiveNetwork" | awk '/Hardware Port/{ print }'|cut -d " " -f3-) + ActiveNetworkName=$(networksetup -listallhardwareports | grep -B 1 "$ActiveNetwork" | awk '/Hardware Port/{print}'| awk '{print $3}') if [[ $ActiveNetworkName == "Wi-Fi" ]]; then - LinkSpeed="$(/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -I | awk '/maxRate/{ print }' | xargs | cut -d " " -f2)Mbps" + LinkSpeed="$(/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -I | awk '/maxRate/{print}' | awk '{print $2}' )Mbps" else - LinkSpeed="$(ifconfig $ActiveNetwork | awk '/media/{ print }' | gsed -E "s/.*\((.*)\).*/\1/gm")" + LinkSpeed="$(ifconfig $ActiveNetwork | awk '/media/{print}' | sed -E "s/.*\((.*)\).*/\1/")" fi network="$ActiveNetwork: $ActiveNetworkName@$LinkSpeed" ;; From 3938f431346bdde2dcfdc8c3f20c37e3f0fbfd9f Mon Sep 17 00:00:00 2001 From: Dummy Date: Sat, 24 Dec 2022 05:26:16 +0100 Subject: [PATCH 4/7] shellcheck: double quote --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 7f6ae154..ff2723d9 100755 --- a/neofetch +++ b/neofetch @@ -3289,12 +3289,12 @@ get_network() { "Mac OS X"|"macOS") ActiveNetwork=$(route get default | grep interface | awk '{print $2}') ActiveNetworkName=$(networksetup -listallhardwareports | grep -B 1 "$ActiveNetwork" | awk '/Hardware Port/{print}'| awk '{print $3}') - if [[ $ActiveNetworkName == "Wi-Fi" ]]; then + if [[ "$ActiveNetworkName" == "Wi-Fi" ]]; then LinkSpeed="$(/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -I | awk '/maxRate/{print}' | awk '{print $2}' )Mbps" else - LinkSpeed="$(ifconfig $ActiveNetwork | awk '/media/{print}' | sed -E "s/.*\((.*)\).*/\1/")" + LinkSpeed="$(ifconfig "$ActiveNetwork" | awk '/media/{print}' | sed -E "s/.*\((.*)\).*/\1/")" fi - network="$ActiveNetwork: $ActiveNetworkName@$LinkSpeed" + network=""$ActiveNetwork": "$ActiveNetworkName"@"$LinkSpeed"" ;; esac while IFS=' ' read -r n i; do From 501c4f5e1f3dcf5b1b4e17d86f521b076fddf0df Mon Sep 17 00:00:00 2001 From: Dummy Date: Sat, 24 Dec 2022 05:30:03 +0100 Subject: [PATCH 5/7] escaped quotes --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index ff2723d9..bf4adf41 100755 --- a/neofetch +++ b/neofetch @@ -3292,9 +3292,9 @@ get_network() { if [[ "$ActiveNetworkName" == "Wi-Fi" ]]; then LinkSpeed="$(/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -I | awk '/maxRate/{print}' | awk '{print $2}' )Mbps" else - LinkSpeed="$(ifconfig "$ActiveNetwork" | awk '/media/{print}' | sed -E "s/.*\((.*)\).*/\1/")" + LinkSpeed="$(ifconfig \"$ActiveNetwork\" | awk '/media/{print}' | sed -E "s/.*\((.*)\).*/\1/")" fi - network=""$ActiveNetwork": "$ActiveNetworkName"@"$LinkSpeed"" + network="\"$ActiveNetwork\": \"$ActiveNetworkName\"@\"$LinkSpeed\"" ;; esac while IFS=' ' read -r n i; do From b30bbf5927940caefdf4f2518b631e140b40e995 Mon Sep 17 00:00:00 2001 From: Dummy Date: Sat, 24 Dec 2022 05:46:14 +0100 Subject: [PATCH 6/7] Revert "shellcheck: double quote" This reverts commit 3938f431346bdde2dcfdc8c3f20c37e3f0fbfd9f. --- neofetch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index bf4adf41..3cc84dd6 100755 --- a/neofetch +++ b/neofetch @@ -3289,12 +3289,18 @@ get_network() { "Mac OS X"|"macOS") ActiveNetwork=$(route get default | grep interface | awk '{print $2}') ActiveNetworkName=$(networksetup -listallhardwareports | grep -B 1 "$ActiveNetwork" | awk '/Hardware Port/{print}'| awk '{print $3}') - if [[ "$ActiveNetworkName" == "Wi-Fi" ]]; then + if [[ $ActiveNetworkName == "Wi-Fi" ]]; then LinkSpeed="$(/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -I | awk '/maxRate/{print}' | awk '{print $2}' )Mbps" else +<<<<<<< HEAD LinkSpeed="$(ifconfig \"$ActiveNetwork\" | awk '/media/{print}' | sed -E "s/.*\((.*)\).*/\1/")" fi network="\"$ActiveNetwork\": \"$ActiveNetworkName\"@\"$LinkSpeed\"" +======= + LinkSpeed="$(ifconfig $ActiveNetwork | awk '/media/{print}' | sed -E "s/.*\((.*)\).*/\1/")" + fi + network="$ActiveNetwork: $ActiveNetworkName@$LinkSpeed" +>>>>>>> parent of 3938f431 (shellcheck: double quote) ;; esac while IFS=' ' read -r n i; do From c69407345cb66822f249540ccbc01dfa17349e44 Mon Sep 17 00:00:00 2001 From: Dummy Date: Sat, 24 Dec 2022 05:51:03 +0100 Subject: [PATCH 7/7] shellcheck fix --- neofetch | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 3cc84dd6..5974b93b 100755 --- a/neofetch +++ b/neofetch @@ -3292,15 +3292,9 @@ get_network() { if [[ $ActiveNetworkName == "Wi-Fi" ]]; then LinkSpeed="$(/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -I | awk '/maxRate/{print}' | awk '{print $2}' )Mbps" else -<<<<<<< HEAD - LinkSpeed="$(ifconfig \"$ActiveNetwork\" | awk '/media/{print}' | sed -E "s/.*\((.*)\).*/\1/")" - fi - network="\"$ActiveNetwork\": \"$ActiveNetworkName\"@\"$LinkSpeed\"" -======= - LinkSpeed="$(ifconfig $ActiveNetwork | awk '/media/{print}' | sed -E "s/.*\((.*)\).*/\1/")" + LinkSpeed="$(ifconfig "$ActiveNetwork" | awk '/media/{print}' | sed -E "s/.*\((.*)\).*/\1/")" fi network="$ActiveNetwork: $ActiveNetworkName@$LinkSpeed" ->>>>>>> parent of 3938f431 (shellcheck: double quote) ;; esac while IFS=' ' read -r n i; do