From 837046c7e64146af4656ea57f65b928524f337f7 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Wed, 24 Oct 2018 18:13:30 +0200
Subject: [PATCH] Dev master
---
install.sh | 4 ++--
utils/init_symlinks.sh | 14 ++++++++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/install.sh b/install.sh
index a085f034..75016fa2 100755
--- a/install.sh
+++ b/install.sh
@@ -15,11 +15,11 @@ else
./pull_subtrees.sh
./copy_hooks.sh
- cd ../conf
+ cd ../client/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 --dev
+ grunt -dev
fi
diff --git a/utils/init_symlinks.sh b/utils/init_symlinks.sh
index 217081b5..f073ab46 100755
--- a/utils/init_symlinks.sh
+++ b/utils/init_symlinks.sh
@@ -68,10 +68,20 @@ fi
# Conf
echo "---- Link conf ----"
if ! [ -e "src/vitis/client/conf" ]; then
- ln -rsf conf client/conf
+ # ln -rsf conf client/conf
+
+ mkdir client/conf
+ for elem in $( ls "conf"); do
+ if [[ $elem != 'properties.json' ]]; then
+ if [[ -d "conf/${elem}" || -f "conf/${elem}" ]]; then
+ echo "---- Link conf/$elem"
+ ln -rsf conf/$elem client/conf/$elem
+ fi
+ fi
+ done
fi
if ! [ -e "conf/closure" ]; then
- ln -rsf src/closure/conf conf/closure
+ ln -rsf src/closure/conf client/conf/closure
fi
# Modules
--
GitLab