calendar: cal variable added

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index c9e265a447ed3916db25c0c9d7532967f6fc2537..bd7f08cee38be58a568b1f2c4bb471ba5272b53e 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -37,13 +37,13 @@ function calendar:show(t_out, inc_offset)
     local tims = t_out or 0
     local f, c_text
     local today = tonumber(os.date('%d'))
     local tims = t_out or 0
     local f, c_text
     local today = tonumber(os.date('%d'))

-    local init_t = '/usr/bin/cal | sed -r -e "s/(^| )( '
+    local init_t = calendar.cal .. ' | sed -r -e "s/(^| )( '

 
     if offs == 0
     then -- current month showing, today highlighted
         if today >= 10
         then
 
     if offs == 0
     then -- current month showing, today highlighted
         if today >= 10
         then

-           init_t = '/usr/bin/cal | sed -r -e "s/(^| )('
+           init_t = calendar.cal .. ' | sed -r -e "s/(^| )('

         end
 
         calendar.offset = 0
         end
 
         calendar.offset = 0


@@ -80,7 +80,7 @@ function calendar:show(t_out, inc_offset)
 
        calendar.notify_icon = nil
 
 
        calendar.notify_icon = nil
 

-       f = io.popen('/usr/bin/cal ' .. month .. ' ' .. year)
+       f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year)

     end
 
     c_text = "<tt><span font='" .. calendar.font .. " "
     end
 
     c_text = "<tt><span font='" .. calendar.font .. " "


@@ -103,6 +103,7 @@ end
 
 function calendar:attach(widget, args)
     local args = args or {}
 
 function calendar:attach(widget, args)
     local args = args or {}

+    calendar.cal       = args.cal or "/usr/bin/cal"

     calendar.icons     = args.icons or icons_dir .. "cal/white/"
     calendar.font      = args.font or beautiful.font:sub(beautiful.font:find(""),
                          beautiful.font:find(" "))
     calendar.icons     = args.icons or icons_dir .. "cal/white/"
     calendar.font      = args.font or beautiful.font:sub(beautiful.font:find(""),
                          beautiful.font:find(" "))

diff --git a/wiki b/wiki
index b35f6931d9685d53e10a051c1d558151331b041f..bff87f6bb0d1707d0f089a4449082ce43b121275 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit b35f6931d9685d53e10a051c1d558151331b041f
+Subproject commit bff87f6bb0d1707d0f089a4449082ce43b121275