X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_version.lua;h=be244beb31fd1c75bd7aa20bcc458056a3d3f3ef;hb=6c91101e5d303ba822d4f8b3c7a1e3ff3fb32376;hp=9af830f8b3a2f39b5d2b6626d3c5fca54a064320;hpb=95c64b70f7cb28745222146784181e866b515069;p=prosody.git

diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua
index 9af830f8..be244beb 100644
--- a/plugins/mod_version.lua
+++ b/plugins/mod_version.lua
@@ -1,7 +1,7 @@
 -- 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.
 --
@@ -10,28 +10,35 @@ 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()
+	: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");
-		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
+		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
 
-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