From 1bccca67e767e8eb7062738375fa597c84a95f7d Mon Sep 17 00:00:00 2001 From: Mika Havela Date: Fri, 4 Sep 2009 10:30:47 +0200 Subject: Output 'apk version --index' in general health. If 'apk verions --index' fails to give output, we fallback to displaying /etc/alpine-release. Last option is to display 'Unknown' (if neither of the above works). --- health-model.lua | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/health-model.lua b/health-model.lua index f8a0444..f505ea7 100644 --- a/health-model.lua +++ b/health-model.lua @@ -14,6 +14,14 @@ local function querycmd ( cmdline ) return cmd_result end +local function indexversion ( ) + local cmd = io.popen( "/sbin/apk version --index 2>/dev/null" ) + local cmd_result = cmd:read("*a") + if cmd_result == "" then cmd_result = nil end + cmd:close() + return cmd_result +end + local function diskfree ( media ) if not (media) then media = "" end local cmd = io.popen( "df -h " .. format.escapespecialcharacters(media) ) @@ -35,7 +43,8 @@ get_system = function (self) local system = {} system.uptime = cfe({ value=querycmd("/usr/bin/uptime"), label="Uptime" }) system.date = cfe({ value=querycmd("/bin/date"), label="Date" }) - system.version = cfe({ value=fs.read_file("/etc/alpine-release") or "Unknown", label="Version" }) + local indexver = indexversion() + system.version = cfe({ value=indexver or fs.read_file("/etc/alpine-release") or "Unknown", label="Version" }) system.timezone = cfe({ value=date.what_tz(), label="Time Zone" }) system.uname = cfe({ value=querycmd("/bin/uname -a"), label="UName" }) system.memory = cfe({ value=querycmd("/usr/bin/free"), label="Memory usage" }) -- cgit v1.2.3