From f1010d615bc8e7ad25b9c708ffe04c3f66cae8cd Mon Sep 17 00:00:00 2001 From: Oseltamivir Date: Sun, 3 Nov 2024 02:52:49 +0800 Subject: [PATCH] pstree regex change to be more lax for brew version --- script/get-generic-sys-util/_cm.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/script/get-generic-sys-util/_cm.json b/script/get-generic-sys-util/_cm.json index 2579713152..ef849a3246 100644 --- a/script/get-generic-sys-util/_cm.json +++ b/script/get-generic-sys-util/_cm.json @@ -414,7 +414,7 @@ "CM_SYS_UTIL_NAME": "libnuma-dev", "CM_SYS_UTIL_VERSION_CMD": "dpkg -l | grep libnuma", "CM_SYS_UTIL_VERSION_RE": "\\b(\\d+\\.\\d+(?:\\.\\d+)?)\\b", - "CM_TMP_VERSION_DETECT_GROUP_NUMBER": 0 + "CM_TMP_VERSION_DETECT_GROUP_NUMBER": 0 }, "state": { "libnuma-dev": { @@ -559,7 +559,6 @@ "CM_SYS_UTIL_VERSION_RE": "\\b(\\d+\\.\\d+(?:\\.\\d+)?)\\b", "CM_TMP_VERSION_DETECT_GROUP_NUMBER": 0 }, - "new_env_keys": ["CM_MD5SHA1SUM_VERSION"], "state": { "md5sha1sum": { "apt": "", @@ -663,10 +662,10 @@ }, "psmisc": { "env": { - "CM_SYS_UTIL_VERSION_CMD_USE_ERROR_STREAM": "yes", + "CM_SYS_UTIL_VERSION_CMD_USE_ERROR_STREAM": "yes", "CM_SYS_UTIL_NAME": "psmisc", "CM_SYS_UTIL_VERSION_CMD": "pstree --version", - "CM_SYS_UTIL_VERSION_RE": "pstree \\(PSmisc\\) (\\d+\\.\\d+(?:\\.\\d+)?)" + "CM_SYS_UTIL_VERSION_RE": "\b\\d+\\.\\d+(?:\\.\\d+)?\\b" }, "state": { "psmisc": {