From 37d37d034acfcb9b1d2dfc7bd45ef9450699c986 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Wed, 17 Oct 2018 09:27:27 +0200
Subject: [PATCH] Add grunt to the install
---
.gitignore | 2 ++
install.sh | 10 +++++++++-
utils/pull_subtrees.sh | 1 +
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 37badcac..d8b5d991 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
client
vas
conf/closure
+conf/node_modules/
conf/properties.json
+src/closure/conf/depswriter/
src/vitis/vas/log/
src/vitis/vas/public/
src/vitis/vas/server/
diff --git a/install.sh b/install.sh
index b5ceb92a..532422eb 100755
--- a/install.sh
+++ b/install.sh
@@ -11,7 +11,15 @@ if [ `whoami` == "root" ]; then
echo "Please, do not run this script as sudo"
else
cd utils/
- ./init_symlinks.sh
+ # ./init_symlinks.sh
./pull_subtrees.sh
./copy_hooks.sh
+
+ cd ../conf
+ npm install grunt --save
+ npm install grunt-cli
+ npm install grunt-closure-tools --save
+ npm install google-closure-compiler@20160911.0.0 --save
+ npm install google-closure-library@20160911.0.0 --save
+ grunt
fi
diff --git a/utils/pull_subtrees.sh b/utils/pull_subtrees.sh
index f8ba5fc5..c2793f2e 100755
--- a/utils/pull_subtrees.sh
+++ b/utils/pull_subtrees.sh
@@ -21,6 +21,7 @@ git subtree pull --prefix src/vitis --squash -m "pull subtree" "git@gitlab.vere
# fichiers à ignorer
git update-index --assume-unchanged conf/properties.json
+git update-index --assume-unchanged conf/package.json
git update-index --assume-unchanged src/vitis/vas/rest/.htaccess
git update-index --assume-unchanged src/vitis/vas/rest/conf/properties.inc
git update-index --assume-unchanged src/vitis/vas/rest/conf/properties_domain.inc
--
GitLab