projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.9->trunk
[prosody.git]
/
plugins
/
mod_version.lua
diff --git
a/plugins/mod_version.lua
b/plugins/mod_version.lua
index 9af830f8b3a2f39b5d2b6626d3c5fca54a064320..d35103b643266f7d5ef6dcab88951793b1f87e0c 100644
(file)
--- a/
plugins/mod_version.lua
+++ b/
plugins/mod_version.lua
@@
-1,6
+1,6
@@
-- Prosody IM
-- Prosody IM
--- Copyright (C) 2008-20
09
Matthew Wild
--- Copyright (C) 2008-20
09
Waqas Hussain
+-- Copyright (C) 2008-20
10
Matthew Wild
+-- Copyright (C) 2008-20
10
Waqas Hussain
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
@@
-10,28
+10,35
@@
local st = require "util.stanza";
module:add_feature("jabber:iq:version");
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()
+ :tag("version"):text(prosody.version):up();
if not module:get_option("hide_os_type") then
if os.getenv("WINDIR") then
version = "Windows";
else
if not module:get_option("hide_os_type") then
if os.getenv("WINDIR") then
version = "Windows";
else
- local uname = io.popen("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, "util.pposix");
+ if not os_version_command and (ok and pposix and pposix.uname) then
+ version = pposix.uname().sysname;
end
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
end
end
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
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