aynish/helm
1
0
Fork 0
Code Pull requests Packages Projects Releases Activity

panel: polish lemonbar config & fix fail-to-boot bug

Browse source
This commit is contained in:
Henrik Lissner 2016-11-03 18:47:41 +01:00
parent 658b117b53
commit 5126091213
1 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
os/arch/.config/panel/panel.sh
View file

@ -1,30 +1,32 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [[ $1 == "--kill" ]]
then
pkill -f 'bash .+/panel\.sh'
exit
fi
CWD="$(cd $(dirname $0) && pwd -P)" CWD="$(cd $(dirname $0) && pwd -P)"
. $CWD/panel_config
# #
. $CWD/panel_config running() { pgrep -f $1 >/dev/null; }
# trap "trap - TERM; [ -e "$PANEL_FIFO" ] && rm "$PANEL_FIFO"; kill 0" INT TERM QUIT EXIT
if [ -t 0 ] cleanup() {
[ -e "$PANEL_FIFO" ] && rm -f "$PANEL_FIFO"
pkill -P $$
}
#
trap cleanup INT TERM QUIT EXIT
[ -e "$PANEL_FIFO" ] && rm "$PANEL_FIFO"
mkfifo "$PANEL_FIFO"
if running lemonbar
then then
if [ "$(pgrep -cx lemonbar)" -gt 0 ]
then
2>&1 echo "Lemonbar already running" 2>&1 echo "Lemonbar already running"
exit exit 1
fi
else
if pgrep lemonbar >/dev/null; then
# redirect stdin to fifo
[ -e "$PANEL_FIFO" ] || mkfifo "$PANEL_FIFO"
while read -r line
do
echo $line > "$PANEL_FIFO" &
done
else
2>&1 echo "Lemonbar isn't running"
fi
exit
fi fi
@ -63,7 +65,7 @@ parse() {
# Minimal icons # Minimal icons
U*) updates=" %{F${COLOR[DIM]}}\ue00f%{F-}" U*) updates=" %{F${COLOR[DIM]}}\ue00f%{F-}"
if [[ "$data" > 0 ]]; then if [[ "$data" > 0 ]]; then
updates=" %{F${COLOR[2]}}\ue00f$data%{F-} " updates=" %{F${COLOR[2]}}\ue00f$data%{F-}"
fi fi
;; ;;
M*) icon="${ICON[mail]}" M*) icon="${ICON[mail]}"
@ -78,24 +80,23 @@ parse() {
esac esac
;; ;;
V*) case "$data" in V*) case "$data" in
0) vol="%{F${COLOR[DIM]}}${ICON[muted]}%{F-}" 0) vol=" %{F${COLOR[DIM]}}${ICON[muted]}%{F-}"
;; ;;
*) vol="${ICON[speaker]}" *) vol=" ${ICON[speaker]}"
;; ;;
esac esac
;; ;;
# Full segments # Full segments
I*) ssid=" ${data#*,}" I*) # ssid=" ${data#*,}"
case "${data%,*}" in case "${data%,*}" in
100|[6-9][0-9]) icon="${ICON[wifi4]}$ssid" ;; 100|[6-9][0-9]) icon="${ICON[wifi3]} " ;;
[4-5][0-9]) icon="${ICON[wifi3]}$ssid" ;; [2-5][0-9]) icon="${ICON[wifi2]} " ;;
[2-3][0-9]) icon="${ICON[wifi2]}$ssid" ;; # [1-2][0-9]) icon="${ICON[wifi2]} " ;;
[0-9]|1[0-9]) icon="${ICON[wifi1]}$ssid" ;;
x) icon="${ICON[wifioff]}" ;; x) icon="${ICON[wifioff]}" ;;
*) icon="${ICON[wifi0]}$ssid" ;; *) icon="${ICON[wifi1]} " ;;
esac esac
wifi=" $icon " wifi=" $icon"
;; ;;
E*) # TODO ethernet E*) # TODO ethernet
;; ;;
@ -182,7 +183,7 @@ parse() {
esac esac
echo -e \ echo -e \
"%{l}${wm}${song}" \ "%{l}${wm}${song}" \
"%{r}${updates}${mail}${vol}${wifi}${datetime} " "%{r}${mail}${updates}${vol}${wifi}${datetime} "
done done
} }