From 0e8bd85602cbe3f894d0cf5b0ce8af5cda40fd66 Mon Sep 17 00:00:00 2001 From: appeasementPolitik <108810900+appeasementPolitik@users.noreply.github.com> Date: Tue, 30 Jun 2026 03:52:33 +0000 Subject: Make dwmblocks modules async (#1296) * Make dwmblocks modules async * Allow dwmblocks signal numbers to be changed * Become synchronous on manual run and make dwmblocks signal code optional * Merge latest commits and add retries * Re-add fail-early to sb-price * Make the retry logic better + other changes * Only redirect non-empty output: for when services are down * Also change modification time * Robustness not needed anymore because of curl's --output, no more empty files * Use actual locks instead of pgrep * Change to more suitable lock file location for user programs * Implement thetubster's changes (fast retry and bug fixes) --- .local/bin/statusbar/sb-iplocate | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to '.local/bin/statusbar/sb-iplocate') diff --git a/.local/bin/statusbar/sb-iplocate b/.local/bin/statusbar/sb-iplocate index a9043e3..a1606e1 100755 --- a/.local/bin/statusbar/sb-iplocate +++ b/.local/bin/statusbar/sb-iplocate @@ -5,10 +5,25 @@ # # https://www.maketecheasier.com/ip-address-geolocation-lookups-linux/ -set -e +ifinstalled "geoip" || exit 1 -ifinstalled "geoip" -addr="$(geoiplookup "$(curl -sfm 1 ifconfig.me 2>/dev/null)")" +getip() { + { grep -q -m1 '^up$' /sys/class/net/w*/operstate || grep -q -m1 '^up$' /sys/class/net/e*/operstate; } && + curl -sf api.ipify.org --output "$ipfile" +} + +ipfile="$XDG_RUNTIME_DIR/iplocate" +addr=$(cat "$ipfile" 2>/dev/null) && addr=$(geoiplookup "$addr" 2>/dev/null) && rm "$ipfile" || + ( flock -n 9 && + ( tries=0; while [ $tries -ne 100 ]; do + getip && break || + { tries=$((tries+1)); sleep .1; } + done + ! [ -f "$ipfile" ] && + until getip; do sleep 60; done && + pkill -RTMIN+"${1:-27}" "${STATUSBAR:-dwmblocks}" + ) & + echo; exit ) 9>"${XDG_RUNTIME_DIR}/sb-iplocate.lock" name="${addr##*, }" flag="$(grep "flag: $name" "${XDG_DATA_HOME:-$HOME/.local/share}/larbs/emoji")" flag="${flag%% *}" -- cgit v1.3.1