mirror of
https://github.com/LukeSmithxyz/voidrice.git
synced 2026-01-30 09:48:11 +01:00
Use actual locks instead of pgrep
This commit is contained in:
parent
b5317fdaf2
commit
1500ec504e
@ -49,8 +49,8 @@ case $BLOCK_BUTTON in
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
checkforecast && showweather ||
|
checkforecast && showweather ||
|
||||||
{ [ -z "$(pgrep 'sb-forecast' | tail -n +3)" ] &&
|
( flock -n 9 &&
|
||||||
( until { [ "$(cat /sys/class/net/w*/operstate)" = 'up' ] || [ "$(cat /sys/class/net/e*/operstate)" = 'up' ]; } &&
|
( until { [ "$(cat /sys/class/net/w*/operstate)" = 'up' ] || [ "$(cat /sys/class/net/e*/operstate)" = 'up' ]; } &&
|
||||||
getforecast; do sleep 60; done &&
|
getforecast; do sleep 60; done &&
|
||||||
pkill -RTMIN+"${1:-5}" "${STATUSBAR:-dwmblocks}" ) &
|
pkill -RTMIN+"${1:-5}" "${STATUSBAR:-dwmblocks}" ) &
|
||||||
echo; }
|
echo ) 9>/tmp/sb-forecast.lock
|
||||||
|
|||||||
@ -9,11 +9,11 @@ ifinstalled "geoip" || exit 1
|
|||||||
|
|
||||||
ipfile="$XDG_RUNTIME_DIR/iplocate"
|
ipfile="$XDG_RUNTIME_DIR/iplocate"
|
||||||
addr=$(cat "$ipfile" 2>/dev/null) && addr=$(geoiplookup "$addr" 2>/dev/null) && rm "$ipfile" ||
|
addr=$(cat "$ipfile" 2>/dev/null) && addr=$(geoiplookup "$addr" 2>/dev/null) && rm "$ipfile" ||
|
||||||
{ [ -z "$(pgrep 'sb-iplocate' | tail -n +3)" ] &&
|
( flock -n 9 &&
|
||||||
( until { [ "$(cat /sys/class/net/w*/operstate)" = 'up' ] || [ "$(cat /sys/class/net/e*/operstate)" = 'up' ]; } &&
|
( until { [ "$(cat /sys/class/net/w*/operstate)" = 'up' ] || [ "$(cat /sys/class/net/e*/operstate)" = 'up' ]; } &&
|
||||||
curl -sf ifconfig.me --output "$ipfile"; do sleep 60; done &&
|
curl -sf api.ipify.org --output "$ipfile"; do sleep 60; done &&
|
||||||
pkill -RTMIN+"${1:-27}" "${STATUSBAR:-dwmblocks}" ) &
|
pkill -RTMIN+"${1:-27}" "${STATUSBAR:-dwmblocks}" ) &
|
||||||
echo; exit; }
|
echo; exit ) 9>/tmp/sb-iplocate.lock
|
||||||
name="${addr##*, }"
|
name="${addr##*, }"
|
||||||
flag="$(grep "flag: $name" "${XDG_DATA_HOME:-$HOME/.local/share}/larbs/emoji")"
|
flag="$(grep "flag: $name" "${XDG_DATA_HOME:-$HOME/.local/share}/larbs/emoji")"
|
||||||
flag="${flag%% *}"
|
flag="${flag%% *}"
|
||||||
|
|||||||
@ -5,11 +5,11 @@
|
|||||||
moonfile="${XDG_DATA_HOME:-$HOME/.local/share}/moonphase"
|
moonfile="${XDG_DATA_HOME:-$HOME/.local/share}/moonphase"
|
||||||
|
|
||||||
[ "$(stat -c %y "$moonfile" 2>/dev/null | cut -d' ' -f1)" = "$(date '+%Y-%m-%d')" ] ||
|
[ "$(stat -c %y "$moonfile" 2>/dev/null | cut -d' ' -f1)" = "$(date '+%Y-%m-%d')" ] ||
|
||||||
{ [ -z "$(pgrep 'sb-moonphase' | tail -n +3)" ] &&
|
( flock -n 9 &&
|
||||||
( until { [ "$(cat /sys/class/net/w*/operstate)" = 'up' ] || [ "$(cat /sys/class/net/e*/operstate)" = 'up' ]; } &&
|
( until { [ "$(cat /sys/class/net/w*/operstate)" = 'up' ] || [ "$(cat /sys/class/net/e*/operstate)" = 'up' ]; } &&
|
||||||
curl -sf "wttr.in/?format=%m" --output "$moonfile" && touch "$moonfile"; do sleep 60; done &&
|
curl -sf "wttr.in/?format=%m" --output "$moonfile" && touch "$moonfile"; do sleep 60; done &&
|
||||||
pkill -RTMIN+"${1:-17}" "${STATUSBAR:-dwmblocks}" ) &
|
pkill -RTMIN+"${1:-17}" "${STATUSBAR:-dwmblocks}" ) &
|
||||||
echo; exit; }
|
echo; exit ) 9>/tmp/sb-moonphase.lock
|
||||||
|
|
||||||
icon="$(cat "$moonfile")"
|
icon="$(cat "$moonfile")"
|
||||||
|
|
||||||
|
|||||||
@ -51,11 +51,11 @@ esac
|
|||||||
updateprice && notify-send "$icon Update complete." "$name price is now \$$(cat "$pricefile")"
|
updateprice && notify-send "$icon Update complete." "$name price is now \$$(cat "$pricefile")"
|
||||||
else
|
else
|
||||||
[ -n "$4" ] &&
|
[ -n "$4" ] &&
|
||||||
{ [ -z "$(pgrep 'sb-price' | tail -n +3)" ] &&
|
( flock -n 9 &&
|
||||||
( until { [ "$(cat /sys/class/net/w*/operstate)" = 'up' ] || [ "$(cat /sys/class/net/e*/operstate)" = 'up' ]; } &&
|
( until { [ "$(cat /sys/class/net/w*/operstate)" = 'up' ] || [ "$(cat /sys/class/net/e*/operstate)" = 'up' ]; } &&
|
||||||
updateprice; do sleep 60; done &&
|
updateprice; do sleep 60; done &&
|
||||||
pkill -RTMIN+"$4" "${STATUSBAR:-dwmblocks}" ) &
|
pkill -RTMIN+"$4" "${STATUSBAR:-dwmblocks}" ) &
|
||||||
echo; exit; } ||
|
echo; exit ) 9>/tmp/sb-price.lock ||
|
||||||
updateprice
|
updateprice
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user