From 3bf5becbe24dfe2e1e130ab245b8f4037b5f87ff Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Fri, 24 Sep 2021 11:15:08 +0200
Subject: [PATCH] sh: Add internet-check base script

Added script to sh base package to allow checking for internet
connectivity. Checks both through system virtual filesystem and, as a
fallback, through pinging google dns.

Added a simple readme to sh module.
---
 polybar/.config/polybar/config |  8 ++++----
 sh/.local/bin/check-internet   | 24 ++++++++++++++++++++++++
 sh/README.md                   | 20 ++++++++++++++++++++
 3 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100755 sh/.local/bin/check-internet
 create mode 100644 sh/README.md

diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index b39d42e..76232eb 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -269,7 +269,7 @@ format-underline = ${colors.primary}
 [module/mail]
 type = custom/script
 exec = echo "$( [ $(systemctl --user --property=ActiveState show mbsync.timer) = 'ActiveState=active' ] && echo "" || echo "" ) $(notmuch count tag:inbox and tag:unread)"
-exec-if = [ "$(notmuch count tag:inbox and tag:unread)" -gt 0 ]
+exec-if = check-internet && [ "$(notmuch count tag:inbox and tag:unread)" -gt 0 ]
 click-right = systemctl --user start mbsync.timer
 click-left = systemctl --user stop mbsync.timer
 interval = 300.0
@@ -278,7 +278,7 @@ format-underline = ${colors.primary}
 [module/weather]
 type = custom/script
 exec = $XDG_CONFIG_HOME/polybar/scripts/poly-weather 'Copenhagen?m&format=%t+%C+(%p)'
-exec-if = type $XDG_CONFIG_HOME/polybar/scripts/poly-weather
+exec-if = type $XDG_CONFIG_HOME/polybar/scripts/poly-weather && check-internet
 interval = 60.0
 ; format-background = ${colors.primary}
 ; format-foreground = ${colors.background}
@@ -301,7 +301,7 @@ tail = true
 [module/archupdates]
 type = custom/script
 exec = $XDG_CONFIG_HOME/polybar/scripts/poly-archupdates
-exec-if = type $XDG_CONFIG_HOME/polybar/scripts/poly-archupdates
+exec-if = type $XDG_CONFIG_HOME/polybar/scripts/poly-archupdates && check-internet
 interval = 600
 format = <label>
 format-prefix = " "
@@ -311,7 +311,7 @@ format-underline = ${colors.primary}
 [module/networkspeed]
 type = custom/script
 exec = $XDG_CONFIG_HOME/polybar/scripts/poly-networkspeed
-exec-if = type $XDG_CONFIG_HOME/polybar/scripts/poly-networkspeed
+exec-if = type $XDG_CONFIG_HOME/polybar/scripts/poly-networkspeed && check-internet
 tail = true
 format-underline = ${colors.primary}
 
diff --git a/sh/.local/bin/check-internet b/sh/.local/bin/check-internet
new file mode 100755
index 0000000..a63b083
--- /dev/null
+++ b/sh/.local/bin/check-internet
@@ -0,0 +1,24 @@
+#!/usr/bin/env sh
+#
+# Check for internet connectivity.
+# Returns 0 if connectivity exists, 1 if it does not.
+
+hasconnec=0
+for intf in /sys/class/net/*; do
+    case $intf in
+    "/sys/class/net/lo") break ;;
+    *)
+        [ "$(cat "$intf/carrier")" = 1 ] && hasconnec=1
+        ;;
+    esac
+done
+
+if [ $hasconnec -ne 1 ]; then
+    ping -q -w 1 -c 1 8.8.8.8 >/dev/null 2>&1 && hasconnec=1
+fi
+
+if [ $hasconnec -eq 1 ]; then
+    exit 0
+else
+    exit 1
+fi
diff --git a/sh/README.md b/sh/README.md
new file mode 100644
index 0000000..364a6bd
--- /dev/null
+++ b/sh/README.md
@@ -0,0 +1,20 @@
+# sh
+
+The bare minimum terminal configuration for a working system.
+Contains:
+
+* an XDG compliant home directory setup
+* several basic environment variables
+* simple aliases
+* an optional fzf default setup
+* X autostart
+
+While other modules are largely optional, 
+this module is the only one strictly necessary for the system to really work at all.
+
+Additionally contains two scripts on which some other modules build:
+
+* a simple script to detect if applications exist
+  (and optionally warn the user if they don't)
+* and a script to check if internet connectivity exists
+