From: copycat-killer Date: Wed, 2 Mar 2016 11:28:57 +0000 (+0100) Subject: cal: sed spaces fix 2; #170 #174 X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/bceaadb433b82fe31f3d9608fd01ea4021ddffe6?ds=inline;hp=--cc cal: sed spaces fix 2; #170 #174 --- bceaadb433b82fe31f3d9608fd01ea4021ddffe6 diff --git a/widgets/calendar.lua b/widgets/calendar.lua index b15d182..0d29bdd 100644 --- a/widgets/calendar.lua +++ b/widgets/calendar.lua @@ -41,8 +41,6 @@ function calendar:show(t_out, inc_offset, scr) local offs = inc_offset or 0 local tims = t_out or 0 local today = tonumber(os.date('%d')) - local init_t = string.format("%s %s | sed -e 's/[\b]\\{3\\}//g'", - calendar.cal, calendar.post_cal) calendar.offset = calendar.offset + offs @@ -52,8 +50,8 @@ function calendar:show(t_out, inc_offset, scr) calendar.notify_icon = calendar.icons .. today .. ".png" -- bg and fg inverted to highlight today - f = io.popen(string.format("%s -e '0,/%d $/ s/ %d / %d<\\/span> <\\/b>/'", - init_t, today, today, calendar.bg, calendar.fg, today)) + f = io.popen(string.format("%s | sed -r -e 's/_\\x08//g' -e '0,/(^| )%d($| )/ s/(^| )%d($| )/\\1%d<\\/span><\\/b>\\2/'", + calendar.cal, today, today, calendar.bg, calendar.fg, today)) else -- no current month showing, no day to highlight local month = tonumber(os.date('%m')) @@ -76,8 +74,7 @@ function calendar:show(t_out, inc_offset, scr) end calendar.notify_icon = nil - - f = io.popen(string.format('%s %s %s %s', calendar.cal, month, year, calendar.post_cal)) + f = io.popen(string.format('%s %s %s', calendar.cal, month, year)) end c_text = "