From 0034971da9b0d1c6a0f610d66cffc6eee1842148 Mon Sep 17 00:00:00 2001 From: Tiago Melo Date: Tue, 27 Aug 2019 10:37:30 +0000 Subject: [PATCH] mgr/dashboard: Prevent angular of getting stuck during installation During npm packages installation Angular was getting stuck waiting for input. Using "NG_CLI_ANALYTICS=false" will prevent that, Signed-off-by: Tiago Melo --- src/pybind/mgr/dashboard/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt index 03c4b4b571480..31a1760263f25 100644 --- a/src/pybind/mgr/dashboard/CMakeLists.txt +++ b/src/pybind/mgr/dashboard/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 .*)$" ". ${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( @@ -50,7 +50,7 @@ endif() add_npm_command( OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules" - COMMAND npm ci + COMMAND NG_CLI_ANALYTICS=false npm ci DEPENDS frontend/package.json WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend COMMENT "dashboard frontend dependencies are being installed" -- 2.39.5