diff options
Diffstat (limited to 'local/bin')
| -rwxr-xr-x | local/bin/grab-spot | 6 | ||||
| -rwxr-xr-x | local/bin/update-dwm-bar | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/local/bin/grab-spot b/local/bin/grab-spot index 989d037..d912d7a 100755 --- a/local/bin/grab-spot +++ b/local/bin/grab-spot @@ -8,7 +8,7 @@ # for example, to get the value of USD in NZD: # grab-spot USD NZD # would place a file at ~/.cache/USDNZD containing the value of the USD in NZD, -# to 4 decimal places +# to 4 decimal places, and a label for the conversion if [ -z $1 ]; then logger "$0: blank FROM currency" @@ -19,8 +19,8 @@ if [ -z $2 ]; then exit fi -# Only bother downloading if it's more than 3 hours old -if ([ ! -f ~/.cache/"$1$2" ] || [ $(find ~/.cache/"$1$2" -mmin +60) ]) ; then +# Only bother downloading if it's more than 1 hour old +if ([ ! -f ~/.cache/currency/"$1$2" ] || [ $(find ~/.cache/currency/"$1$2" -mmin +60) ]) ; then rate=$(curl "http://rate-exchange-1.appspot.com/currency?from=$1&to=$2" | jshon -e rate) if [ $? -ne 0 ] ; then logger "$0: curl error" diff --git a/local/bin/update-dwm-bar b/local/bin/update-dwm-bar index ac68582..bde7aeb 100755 --- a/local/bin/update-dwm-bar +++ b/local/bin/update-dwm-bar @@ -7,8 +7,11 @@ while true; do if hash upsc 2>/dev/null; then ups="UPS: $(upsc eaton5e@zoidberg battery.charge)% $sep " fi - if [ -f ~/.cache/XAGNZD ]; then - xa="$(cat ~/.cache/XAGNZD) $(cat ~/.cache/XAUNZD) $sep " + if [ ! -z "$(ls -A ~/.cache/currency/)" ] ; then + for c in ~/.cache/currency/* ; do + currency="$currency$(cat $c) " + done + currency="$currency$sep " fi if [ -d "/sys/class/power_supply/BAT0/" ]; then bat="$(cat /sys/class/power_supply/BAT0/capacity)%" @@ -35,7 +38,7 @@ while true; do done thermal_string="${thermal_string%,} °C" datetime_string=$(date "+%A $sep %d %h %Y $sep %_I:%M %p (UTC%:::z)") - xsetroot -name "$xa$ups$thermal_string $sep $bat_string$datetime_string" || exit + xsetroot -name "$currency$ups$thermal_string $sep $bat_string$datetime_string" || exit sleep "$DELAY" done |