Просмотр исходного кода

Merge pull request #558 from sharelatex/sk-allow-no-nvm

check for nvm presence before using, survive abscence
Shane Kilkelly 9 лет назад
Родитель
Сommit
4170302d3f
1 измененных файлов с 15 добавлено и 6 удалено
  1. 15 6
      server-ce/bin/install-services

+ 15 - 6
server-ce/bin/install-services

@@ -1,15 +1,24 @@
 #! env bash
 
+[ -z "`type -t nvm`" ] && cat <<EOF
+
+==========================================================
+== NVM not installed, you should consider installing it ==
+==========================================================
+
+EOF
+
+
 grep 'name:' config/services.js | \
 	sed 's/.*name: "\(.*\)",/\1/' | \
 	while read service
 	do
-		pushd $service &&
-		echo "Installing Service $service" &&
-		echo '  installing Node' &&
-		nvm install &&
-		nvm use &&
-		echo '  installing Dependencies' &&
+		pushd $service
+		echo "Installing Service $service"
+		echo '  installing Node'
+		type -t nvm && nvm install
+		type -t nvm && nvm use
+		echo '  installing Dependencies'
 		npm install
 		popd
 	done