From 83de952093c62ead12a2a8d824718befb8cba3aa Mon Sep 17 00:00:00 2001 From: "Archie Hilton (thytom)" Date: Fri, 1 Nov 2019 18:21:46 +0000 Subject: [PATCH] Fixed CPU issue and made internet work Bash backgrounding is bloat --- bar.sh | 21 ++++----------------- dwmbar | 19 ++++++++++++++++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/bar.sh b/bar.sh index ca7df84..1955ee7 100755 --- a/bar.sh +++ b/bar.sh @@ -23,19 +23,6 @@ OUTPUT="" CONFIG_FILE="/home/$USER/.config/dwmbar/config" source $CONFIG_FILE -INTERNET=1 #0 being true - -get_internet() -{ - curl -q http://google.com &> /dev/null - - if [[ $? -eq 0 ]]; then - INTERNET=0 - else - INTERNET=1 - fi -} - get_bar() { for module in $MODULES; do @@ -64,12 +51,12 @@ run_module() run() { - get_internet for module in $MODULES; do pgrep $module &> /dev/null - if [[ $? -eq 1 ]] && [[ $INTERNET -eq 0 ]]; then - run_module $module & - else + notrunning=$([[ $? -eq 1 ]]) + if $notrunning && [[ $INTERNET -eq 0 ]]; then + run_module $module + elif $notrunning && [[ $INTERNET -eq 1 ]]; then [[ "$ONLINE_MODULES" != *"$module"* ]] && run_module $module fi done diff --git a/dwmbar b/dwmbar index 62c26ee..166c4ad 100755 --- a/dwmbar +++ b/dwmbar @@ -1,12 +1,10 @@ #!/bin/bash - # Copyright 2019 Archie Hilton # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -27,6 +25,9 @@ CUSTOM_DIR="$CONFIG_DIR/custom" CONFIG_FILE="$CONFIG_DIR/config" CACHE_DIR="$CONFIG_DIR/.cache" +INTERNET=0 +export INTERNET + print_help(){ echo "dwmbar $VERSION -v Display this help message. @@ -75,5 +76,17 @@ done check_files while :; do - xsetroot -name "$(exec $DEFAULT_BAR_LOCATION)" + date=$(date +'%S') + if [ $(( 10#$date % 5 )) -eq 0 ]; then + echo "check" + wget --spider -q www.google.com + + if [[ $? -eq 0 ]]; then + INTERNET=0 + else + INTERNET=1 + fi + fi + xsetroot -name "$INTERNET $(exec $DEFAULT_BAR_LOCATION)" + # xsetroot -name "$INTERNET" done