From 4d34fcf3af71cb78d80f546af5eac1c0a5076df2 Mon Sep 17 00:00:00 2001 From: Linux User Date: Fri, 19 Aug 2022 10:02:28 +0000 Subject: [PATCH] Add timer to scripts. Updated dwmbar --- .local/bin/dwmbar | 38 ++++++++++++++----- .../scripts/{0010_network => 0010_1_network} | 18 ++++----- .local/scripts/{0020_ram => 0020_1_ram} | 0 .local/scripts/0030_0_cpu | 8 ++++ .local/scripts/0030_cpu | 8 ---- .local/scripts/{0040_wifi => 0040_1_wifi} | 0 .local/scripts/{0050_disk => 0050_5_disk} | 0 .local/scripts/{0180_pulse => 0180_0_pulse} | 0 .local/scripts/{0190_lang => 0190_0_lang} | 0 .local/scripts/{0200_date => 0200_60_date} | 0 .local/scripts/{0210_time => 0210_1_time} | 0 11 files changed, 45 insertions(+), 27 deletions(-) rename .local/scripts/{0010_network => 0010_1_network} (76%) rename .local/scripts/{0020_ram => 0020_1_ram} (100%) create mode 100755 .local/scripts/0030_0_cpu delete mode 100755 .local/scripts/0030_cpu rename .local/scripts/{0040_wifi => 0040_1_wifi} (100%) rename .local/scripts/{0050_disk => 0050_5_disk} (100%) rename .local/scripts/{0180_pulse => 0180_0_pulse} (100%) rename .local/scripts/{0190_lang => 0190_0_lang} (100%) rename .local/scripts/{0200_date => 0200_60_date} (100%) rename .local/scripts/{0210_time => 0210_1_time} (100%) diff --git a/.local/bin/dwmbar b/.local/bin/dwmbar index 5d0cb2e..c06d352 100755 --- a/.local/bin/dwmbar +++ b/.local/bin/dwmbar @@ -3,13 +3,35 @@ DELIM=" " DELIM_START=0 +mkdir -p ~/.local/tmp/ + +run() { + for FILE in $(ls ~/.local/scripts) + do + touch "$HOME/.local/tmp/.tmp_$(echo $FILE | cut -d'_' -f3)_BIT" + { + while true + do + echo "$(sh ~/.local/scripts/$FILE)" > "$HOME/.local/tmp/.tmp_$(echo $FILE | cut -d'_' -f3)_BIT" + sleep=$(echo $FILE | cut -d'_' -f2) + if [ $sleep -eq 0 ] + then + sleep=0.1 + fi + sleep $sleep + done + } & + done +} + status() { strt=0 [ $DELIM_START -eq 1 ] && strt=1 for FILE in $(ls ~/.local/scripts) do - res=$(sh ~/.local/scripts/$FILE) + res=$(cat "$HOME/.local/tmp/.tmp_$(echo $FILE | cut -d'_' -f3)_BIT") + if [ $strt -eq 0 ] then strt=1 @@ -20,14 +42,12 @@ status() { done } -time=$(date +"%s") +run -while true +while : do - if [ $(($time - $(date +"%s"))) -lt 0 ] - then - stat=$(status | tr -d '\n') - xprop -root -set WM_NAME "$stat" - time=$(date +"%s") - fi + stat=$(status | tr -d '\n') + xprop -root -set WM_NAME "$stat" + sleep 0.1 done + diff --git a/.local/scripts/0010_network b/.local/scripts/0010_1_network similarity index 76% rename from .local/scripts/0010_network rename to .local/scripts/0010_1_network index 4db7e87..2b50e49 100755 --- a/.local/scripts/0010_network +++ b/.local/scripts/0010_1_network @@ -16,22 +16,22 @@ done if [ $good -eq 0 ] then - echo "Change DEVICE in ~/.local/scripts/9993_network" + echo "Change DEVICE in ~/.local/scripts/0010_1_network" grep ":" /proc/net/dev | awk -F: '{print $1}' | sed s@\ @@g exit 1 fi -if [ ! -f $HOME/.local/.tmp_RXNET_BIT ] +if [ ! -f $HOME/.local/tmp/.tmp_RXNET_BIT ] then RXNET_BIT=0 TXNET_BIT=0 - echo $RXNET_BIT > $HOME/.local/.tmp_RXNET_BIT - echo $TXNET_BIT > $HOME/.local/.tmp_TXNET_BIT + echo $RXNET_BIT > $HOME/.local/tmp/.tmp_RXNET_BIT + echo $TXNET_BIT > $HOME/.local/tmp/.tmp_TXNET_BIT fi -RXNET_BIT=$(cat $HOME/.local/.tmp_RXNET_BIT) -TXNET_BIT=$(cat $HOME/.local/.tmp_TXNET_BIT) +RXNET_BIT=$(cat $HOME/.local/tmp/.tmp_RXNET_BIT) +TXNET_BIT=$(cat $HOME/.local/tmp/.tmp_TXNET_BIT) line=`grep $DEVICE /proc/net/dev | sed s/.*://` rx=`echo $line | awk '{print $1}'` @@ -40,14 +40,12 @@ tx=`echo $line | awk '{print $9}'` inbound=$(($rx-$RXNET_BIT)) outbound=$(($tx-$TXNET_BIT)) -LASTNETTIME_BIT=$(date +%s) - line=`grep $DEVICE /proc/net/dev | sed s/.*://` RXNET_BIT=`echo $line | awk '{print $1}'` TXNET_BIT=`echo $line | awk '{print $9}'` -echo $RXNET_BIT > $HOME/.local/.tmp_RXNET_BIT -echo $TXNET_BIT > $HOME/.local/.tmp_TXNET_BIT +echo $RXNET_BIT > $HOME/.local/tmp/.tmp_RXNET_BIT +echo $TXNET_BIT > $HOME/.local/tmp/.tmp_TXNET_BIT if [ $inbound -gt $((1024*1024)) ] then diff --git a/.local/scripts/0020_ram b/.local/scripts/0020_1_ram similarity index 100% rename from .local/scripts/0020_ram rename to .local/scripts/0020_1_ram diff --git a/.local/scripts/0030_0_cpu b/.local/scripts/0030_0_cpu new file mode 100755 index 0000000..4cea157 --- /dev/null +++ b/.local/scripts/0030_0_cpu @@ -0,0 +1,8 @@ +#!/bin/bash + +COLOR1="#990057" +COLOR2="#FF00B2" + +usage=$(cat <(grep 'cpu ' /proc/stat) <(sleep 1 && grep 'cpu ' /proc/stat) | awk -v RS="" '{print ($13-$2+$15-$4)*100/($13-$2+$15-$4+$16-$5)}' | cut -d'.' -f1)"%" + +echo "^c$COLOR1^^b$COLOR2^  ^b$COLOR1^^c$COLOR2^ $usage ^d^" diff --git a/.local/scripts/0030_cpu b/.local/scripts/0030_cpu deleted file mode 100755 index 961ee45..0000000 --- a/.local/scripts/0030_cpu +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -COLOR1="#990057" -COLOR2="#FF00B2" - -usage=$(cat <(grep 'cpu ' /proc/stat) <(sleep 0.3 && grep 'cpu ' /proc/stat) | awk -v RS="" '{print ($13-$2+$15-$4)*100/($13-$2+$15-$4+$16-$5)}' | cut -d'.' -f1)"%" - -echo "^c$COLOR1^^b$COLOR2^  ^b$COLOR1^^c$COLOR2^ $usage ^d^" diff --git a/.local/scripts/0040_wifi b/.local/scripts/0040_1_wifi similarity index 100% rename from .local/scripts/0040_wifi rename to .local/scripts/0040_1_wifi diff --git a/.local/scripts/0050_disk b/.local/scripts/0050_5_disk similarity index 100% rename from .local/scripts/0050_disk rename to .local/scripts/0050_5_disk diff --git a/.local/scripts/0180_pulse b/.local/scripts/0180_0_pulse similarity index 100% rename from .local/scripts/0180_pulse rename to .local/scripts/0180_0_pulse diff --git a/.local/scripts/0190_lang b/.local/scripts/0190_0_lang similarity index 100% rename from .local/scripts/0190_lang rename to .local/scripts/0190_0_lang diff --git a/.local/scripts/0200_date b/.local/scripts/0200_60_date similarity index 100% rename from .local/scripts/0200_date rename to .local/scripts/0200_60_date diff --git a/.local/scripts/0210_time b/.local/scripts/0210_1_time similarity index 100% rename from .local/scripts/0210_time rename to .local/scripts/0210_1_time