From e4f1de64d41c58b072a5019b648a4fcc11f861e5 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 21 Jul 2021 10:05:53 +0800 Subject: [PATCH] cmake: simplify the regex for matching npm command npx command was added in 3fe39d4899f909d4db8bb3fbc1de5367b280620d, but we don't use npx anymore, so drop it. Signed-off-by: Kefu Chai --- src/pybind/mgr/dashboard/frontend/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt index 48ef908f0e115..3d9995b7c5d4b 100644 --- a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt +++ b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt @@ -6,7 +6,7 @@ function(add_npm_command) cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN}) string(REPLACE ";" " " command "${NC_COMMAND}") if(NC_NODEENV) - string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command}) + string(REGEX REPLACE "^(.*npm .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command}) endif() string(REPLACE " " ";" command "${command}") add_custom_command( -- 2.39.5