From 3153d0f4c522c6c344e0dc8ff530130efe452502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Brunner?= <stephane.brunner@camptocamp.com>
Date: Wed, 31 May 2017 11:59:25 +0200
Subject: [PATCH] Don't install latest npm version

---
 .../scaffolds/update/CONST_Makefile_tmpl      | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/c2cgeoportal/scaffolds/update/CONST_Makefile_tmpl b/c2cgeoportal/scaffolds/update/CONST_Makefile_tmpl
index 52b2e5c542..6948d37869 100644
--- a/c2cgeoportal/scaffolds/update/CONST_Makefile_tmpl
+++ b/c2cgeoportal/scaffolds/update/CONST_Makefile_tmpl
@@ -187,11 +187,6 @@ export VISIBLE_WEB_PROTOCOL
 
 # ngeo
 ANGULAR_VERSION = 1.5
-ifeq ($(OPERATING_SYSTEM), LINUX)
-NPM_CMD = node_modules/.bin/npm
-else
-NPM_CMD = npm
-endif
 APP_OUTPUT_DIR = $(PACKAGE)/static-ngeo/build
 OL_JS_FILES = $(shell $(FIND) node_modules/openlayers/src/ol -type f -name '*.js' 2> /dev/null)
 NGEO_JS_FILES = $(shell $(FIND) node_modules/ngeo/src -type f -name '*.js' 2> /dev/null)
@@ -615,8 +610,8 @@ serve: build development.ini
 	$(VENV_BIN)/pserve --reload --monitor-restart development.ini
 
 .PHONY: update-node-modules
-update-node-modules: $(NPM_CMD)
-	$(NPM_CMD) install --force
+update-node-modules:
+	npm install --force
 	mkdir -p .build
 	touch .build/node_modules.timestamp
 
@@ -966,19 +961,11 @@ else
 	touch $@
 endif
 
-$(NPM_CMD):
-	$(PRERULE_CMD)
-ifeq ($(OPERATING_SYSTEM), LINUX)
-	npm install npm || sleep 20 || npm install npm || sleep 90 || npm install npm
-else
-	touch $@
-endif
-
-.build/node_modules.timestamp: package.json $(NPM_CMD)
+.build/node_modules.timestamp: package.json
 	$(PRERULE_CMD)
 	mkdir -p $(dir $@)
 ifneq ($(NGEO_INTERFACES), "")
-	$(NPM_CMD) install || sleep 20 || $(NPM_CMD) install || sleep 90 || $(NPM_CMD) install
+	npm install || sleep 20 || npm install || sleep 90 || npm install
 endif
 	touch $@
 
@@ -1007,7 +994,7 @@ update:
 	git submodule foreach git submodule foreach git clean -fd
 ifneq ($(NGEO_INTERFACES), "")
 	rm -f .build/node_modules.timestamp
-	$(NPM_CMD) install --force
+	npm install --force
 	touch .build/node_modules.timestamp
 endif
 	@echo After that you should launch the `build` task.