From: Deiz Date: Sat, 4 Apr 2015 17:12:30 +0000 (-0400) Subject: Basic XDG support and minor tweaks to the net-speed script X-Git-Tag: 2.10~34^2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=refs%2Fpull%2F23%2Fhead;p=i3%2Fi3status Basic XDG support and minor tweaks to the net-speed script --- diff --git a/contrib/net-speed b/contrib/net-speed index 3b7b30b..ca0a850 100755 --- a/contrib/net-speed +++ b/contrib/net-speed @@ -44,13 +44,23 @@ ifaces=$(ls /sys/class/net | grep -E '^(eth|wlan)') # Interval must be the same as in i3status.conf #interval=5 +if [ -z "$XDG_CONFIG_HOME" ]; then + XDG_CONFIG_HOME="${HOME}/.config" +fi + # Auto detect -if [ -f ~/.i3status.conf ]; then +if [ -f "${XDG_CONFIG_HOME}/i3status/config" ]; then + i3status_conf="${XDG_CONFIG_HOME}/i3status/config" +elif [ -f ~/.i3status.conf ]; then i3status_conf=~/.i3status.conf else i3status_conf="/etc/i3status.conf" fi -interval=$(grep -o '^[[:space:]]*interval[[:space:]]*=[[:space:]]*[[:digit:]]\+' $i3status_conf | grep -o '[[:digit:]]\+') + +if [ -f "$i3status_conf" ]; then + interval=$(grep -o '^[[:space:]]*interval[[:space:]]*=[[:space:]]*[[:digit:]]\+' $i3status_conf | grep -o '[[:digit:]]\+') +fi + if [ x"$interval" = x ]; then interval=5 fi