diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-08-31 15:32:36 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-08-31 15:32:36 +0100 |
| commit | a0a2887bf66a930635505a567c350def6b962143 (patch) | |
| tree | ea968ad997441e4282e2b840ee9c7b781c8f10e0 | |
| parent | c739eebe35537fb0d420627d50bcd68c53a0a6f0 (diff) | |
| download | prosody-a0a2887bf66a930635505a567c350def6b962143.tar.gz prosody-a0a2887bf66a930635505a567c350def6b962143.zip | |
mod_version: Use pposix.uname() if available and os_version_command not set
| -rw-r--r-- | plugins/mod_version.lua | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua index f3c5c190..52d8d290 100644 --- a/plugins/mod_version.lua +++ b/plugins/mod_version.lua @@ -10,7 +10,7 @@ local st = require "util.stanza"; module:add_feature("jabber:iq:version"); -local version = "the best operating system ever!"; +local version; local query = st.stanza("query", {xmlns = "jabber:iq:version"}) :tag("name"):text("Prosody"):up() @@ -20,15 +20,23 @@ if not module:get_option("hide_os_type") then if os.getenv("WINDIR") then version = "Windows"; else - local uname = io.popen(module:get_option("os_version_command") or "uname"); - if uname then - version = uname:read("*a"); - else - version = "an OS"; + local os_version_command = module:get_option("os_version_command"); + local ok pposix = pcall(require, "pposix"); + if not os_version_command and (ok and pposix and pposix.uname) then + version = pposix.uname().sysname; end + if not version then + local uname = io.popen(os_version_command or "uname"); + if uname then + version = uname:read("*a"); + end + uname:close(); + end + end + if version then + version = version:match("^%s*(.-)%s*$") or version; + query:tag("os"):text(version):up(); end - version = version:match("^%s*(.-)%s*$") or version; - query:tag("os"):text(version):up(); end module:hook("iq/host/jabber:iq:version:query", function(event) |