From 62537a8c6b1a09382c141ca68031a78ccc5de7a6 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Wed, 29 Apr 2020 09:36:11 -0400 Subject: [PATCH] scripts/network.sh: use a list of hosts - Use a list of hosts: google.com, github.com, example.com - Script will try each in turn, stopping at the first one that connects - Also fix she-bang and some quotes - Tested with Wifi and Offline. --- scripts/network.sh | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/scripts/network.sh b/scripts/network.sh index 5a3d37c..87c9156 100755 --- a/scripts/network.sh +++ b/scripts/network.sh @@ -1,9 +1,10 @@ -#/usr/bin/env bash +#!/usr/bin/env bash #author: Dane Williams #script for gathering internet connectivity info #script is called in dracula.tmux program +HOSTS="google.com github.com example.com" get_ssid() { @@ -11,9 +12,9 @@ get_ssid() case $(uname -s) in Linux) if iw dev | grep ssid | cut -d ' ' -f 2 &> /dev/null; then - echo $(iw dev | grep ssid | cut -d ' ' -f 2) + echo "$(iw dev | grep ssid | cut -d ' ' -f 2)" else - echo ' Ethernet' + echo 'Ethernet' fi ;; @@ -21,7 +22,7 @@ get_ssid() 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)" else - echo ' Ethernet' + echo 'Ethernet' fi ;; @@ -37,11 +38,15 @@ get_ssid() main() { - if ping -q -c 1 -W 1 github.com &>/dev/null; then - echo "$(get_ssid)" - else - echo ' Offline' - fi + network="Offline" + for host in $HOSTS; do + if ping -q -c 1 -W 1 $host &>/dev/null; then + network="$(get_ssid)" + break + fi + done + + echo " $network" } #run main driver function