Ignore version detect error for md5sum on macos

mlcommons · Nov 1, 2024 · 4de4c7d · 4de4c7d
1 parent ee098c9
commit 4de4c7d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/script/get-generic-sys-util/_cm.json b/script/get-generic-sys-util/_cm.json
@@ -458,10 +458,9 @@
     "md5sha1sum": {
       "env": {
         "CM_SYS_UTIL_NAME": "md5sha1sum",
-        "CM_SYS_UTIL_VERSION_CMD": "md5sum --version",
+        "CM_SYS_UTIL_VERSION_CMD": "md5sum --version | grep sha1sum",
         "CM_SYS_UTIL_VERSION_RE": "\\b(\\d+\\.\\d+(?:\\.\\d+)?)\\b",
-        "CM_TMP_VERSION_DETECT_GROUP_NUMBER": 0,
-        "CM_SYS_UTIL_VERSION_CMD_IGNORE_ERROR": "yes"
+        "CM_TMP_VERSION_DETECT_GROUP_NUMBER": 0
       },
       "new_env_keys": ["CM_MD5SHA1SUM_VERSION"],
       "state": {

diff --git a/script/get-generic-sys-util/detect.sh b/script/get-generic-sys-util/detect.sh
@@ -8,12 +8,7 @@ if [[ -n "${CM_SYS_UTIL_VERSION_CMD}" ]]; then
     cmd="${CM_SYS_UTIL_VERSION_CMD}  > tmp-ver.out"
   fi
   echo $cmd
-  if [[ "${CM_SYS_UTIL_VERSION_CMD_IGNORE_ERROR}" == "yes" ]]; then
-    eval $cmd
-    exit 0
-  else
-    eval $cmd
-    test $? -eq 0 || exit $?
-  fi
+  eval $cmd
+  test $? -eq 0 || exit $?
 fi