X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_version.lua;h=f3c5c1903376e5663a5b0bcdeb673a83e06ff147;hb=3ea4e9da6700b0032e4002f6804040f501581da2;hp=9af830f8b3a2f39b5d2b6626d3c5fca54a064320;hpb=1fcbec749479d8e6f4be2c336e3711fe3d191bde;p=prosody.git diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua index 9af830f8..f3c5c190 100644 --- a/plugins/mod_version.lua +++ b/plugins/mod_version.lua @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. @@ -12,26 +12,25 @@ module:add_feature("jabber:iq:version"); local version = "the best operating system ever!"; +local query = st.stanza("query", {xmlns = "jabber:iq:version"}) + :tag("name"):text("Prosody"):up() + :tag("version"):text(prosody.version):up(); + if not module:get_option("hide_os_type") then if os.getenv("WINDIR") then version = "Windows"; else - local uname = io.popen("uname"); + local uname = io.popen(module:get_option("os_version_command") or "uname"); if uname then version = uname:read("*a"); else version = "an OS"; end end + version = version:match("^%s*(.-)%s*$") or version; + query:tag("os"):text(version):up(); end -version = version:match("^%s*(.-)%s*$") or version; - -local query = st.stanza("query", {xmlns = "jabber:iq:version"}) - :tag("name"):text("Prosody"):up() - :tag("version"):text(prosody.version):up() - :tag("os"):text(version); - module:hook("iq/host/jabber:iq:version:query", function(event) local stanza = event.stanza; if stanza.attr.type == "get" and stanza.attr.to == module.host then