]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

pull #133: rename notification_text_cmd -> notification_text_fun
authorcopycat-killer <dada@archlinux.info>
Sat, 29 Aug 2015 17:46:18 +0000 (19:46 +0200)
committercopycat-killer <dada@archlinux.info>
Sat, 29 Aug 2015 17:46:18 +0000 (19:46 +0200)
widgets/weather.lua
wiki

index dacdd41c633b1137ceb045e3ae3157d8f16a5634..de3163c9602ffb8e27d78329ba14817e2eddad9e 100644 (file)
@@ -41,7 +41,7 @@ local function worker(args)
     local date_cmd              = args.date_cmd or "date -u -d @%d +'%%a %%d'"
     local icons_path            = args.icons_path or lain_icons .. "openweathermap/"
     local notification_preset   = args.notification_preset or {}
     local date_cmd              = args.date_cmd or "date -u -d @%d +'%%a %%d'"
     local icons_path            = args.icons_path or lain_icons .. "openweathermap/"
     local notification_preset   = args.notification_preset or {}
-    local notification_text_cmd = args.notification_text_cmd or
+    local notification_text_fun = args.notification_text_fun or
                                   function (day, desc, tmin, tmax)
                                       return string.format("<b>%s</b>: %s, %d - %d  ", day, desc, tmin, tmax)
                                   end
                                   function (day, desc, tmin, tmax)
                                       return string.format("<b>%s</b>: %s, %d - %d  ", day, desc, tmin, tmax)
                                   end
@@ -98,7 +98,7 @@ local function worker(args)
                     local desc = weather_now["list"][i]["weather"][1]["description"]
 
                     weather.notification_text = weather.notification_text ..
                     local desc = weather_now["list"][i]["weather"][1]["description"]
 
                     weather.notification_text = weather.notification_text ..
-                                                notification_text_cmd(day, desc, tmin, tmax)
+                                                notification_text_fun(day, desc, tmin, tmax)
 
                     if i < weather_now["cnt"] then
                         weather.notification_text = weather.notification_text .. "\n"
 
                     if i < weather_now["cnt"] then
                         weather.notification_text = weather.notification_text .. "\n"
diff --git a/wiki b/wiki
index e21f7ddbdd05019501136a7cca1ac6c897eae2ce..a24a74924b80b7293d0f4171a855f1eb23ab90cc 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit e21f7ddbdd05019501136a7cca1ac6c897eae2ce
+Subproject commit a24a74924b80b7293d0f4171a855f1eb23ab90cc