From b3d58930a8bfd34c89455284ecd3536696914850 Mon Sep 17 00:00:00 2001 From: xero Date: Mon, 28 Jul 2014 12:20:23 -0400 Subject: fix names for consistancy --- herbstluftwm/.config/herbstluftwm/panel.sh | 2 +- herbstluftwm/code/sys/cal.sh | 15 --------------- herbstluftwm/code/sys/calendar | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 16 deletions(-) delete mode 100755 herbstluftwm/code/sys/cal.sh create mode 100755 herbstluftwm/code/sys/calendar diff --git a/herbstluftwm/.config/herbstluftwm/panel.sh b/herbstluftwm/.config/herbstluftwm/panel.sh index 1deac3e..0c325a8 100755 --- a/herbstluftwm/.config/herbstluftwm/panel.sh +++ b/herbstluftwm/.config/herbstluftwm/panel.sh @@ -76,7 +76,7 @@ hc pad $monitor $panel_height while true ; do # "date" output is checked once a second, but an event is only # generated if the output changed compared to the previous run. - date +$'date\t^bg(#666666) ^ca(1,~/code/sys/cal.sh)^fg(#d9d9d9)^i(/usr/share/icons/stlarch_icons/clock1.xbm) ^fg(#efefef)%H:%M^fg(#bcbcbc) %Y-%m-^fg(#efefef)%d^ca() ' + date +$'date\t^bg(#666666) ^ca(1,~/code/sys/calendar)^fg(#d9d9d9)^i(/usr/share/icons/stlarch_icons/clock1.xbm) ^fg(#efefef)%H:%M^fg(#bcbcbc) %Y-%m-^fg(#efefef)%d^ca() ' sleep 1 || break done > >(uniq_linebuffered) & childpid=$! diff --git a/herbstluftwm/code/sys/cal.sh b/herbstluftwm/code/sys/cal.sh deleted file mode 100755 index f339a8c..0000000 --- a/herbstluftwm/code/sys/cal.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# popup calendar for dzen -font="-Gohu-GohuFont-Medium-R-Normal--11-80-100-100-C-60-ISO10646-1" -TODAY=$(expr `date +'%d'` + 0) -MONTH=`date +'%m'` -YEAR=`date +'%Y'` -LINES=$(cal -m | wc -l) -LINES=$((LINES + 2)) - -( -date +'^bg(#666666) ' -date +'' -# current month, highlight header and today -cal -m | sed -r -e "1,2 s/.*/^fg(#737373)&^fg()/" -e "s/(^| )($TODAY)($| )/\1^bg(#6A8C8C)^fg(#000000)\2^fg()^bg()\3/") | dzen2 -x 1290 -y 4 -w 146 -h 12 -l $LINES -sa c -p -e 'onstart=uncollapse,hide;button1=exit;' -fg "#909090" -tw 6 -fn "$font" -) diff --git a/herbstluftwm/code/sys/calendar b/herbstluftwm/code/sys/calendar new file mode 100755 index 0000000..f339a8c --- /dev/null +++ b/herbstluftwm/code/sys/calendar @@ -0,0 +1,15 @@ +#!/bin/bash +# popup calendar for dzen +font="-Gohu-GohuFont-Medium-R-Normal--11-80-100-100-C-60-ISO10646-1" +TODAY=$(expr `date +'%d'` + 0) +MONTH=`date +'%m'` +YEAR=`date +'%Y'` +LINES=$(cal -m | wc -l) +LINES=$((LINES + 2)) + +( +date +'^bg(#666666) ' +date +'' +# current month, highlight header and today +cal -m | sed -r -e "1,2 s/.*/^fg(#737373)&^fg()/" -e "s/(^| )($TODAY)($| )/\1^bg(#6A8C8C)^fg(#000000)\2^fg()^bg()\3/") | dzen2 -x 1290 -y 4 -w 146 -h 12 -l $LINES -sa c -p -e 'onstart=uncollapse,hide;button1=exit;' -fg "#909090" -tw 6 -fn "$font" +) -- cgit v1.2.1