From 5c00d023e67269720bbfe1e929b7417f88b010e6 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Mon, 15 Oct 2018 17:04:18 +0200
Subject: [PATCH] =?UTF-8?q?Permettre=20de=20relancer=20le=20script=20sans?=
=?UTF-8?q?=20symlinks=20dupliqu=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
utils/init_symlinks.sh | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/utils/init_symlinks.sh b/utils/init_symlinks.sh
index 593dcb16..ef5fd4d9 100755
--- a/utils/init_symlinks.sh
+++ b/utils/init_symlinks.sh
@@ -21,19 +21,20 @@ cd ..
# Vitis
echo "---- Link vitis ----"
-if ! [ -f "$(pwd)/client" ]; then
+if ! [ -e "$(pwd)/client" ]; then
+ echo "---- Link vitis 2 ----"
ln -rsf src/vitis/client client
fi
-if ! [ -f "$(pwd)/vas" ]; then
+if ! [ -e "$(pwd)/vas" ]; then
ln -rsf src/vitis/vas vas
fi
# Conf
echo "---- Link conf ----"
-if ! [ -f "src/vitis/client/conf" ]; then
+if ! [ -e "src/vitis/client/conf" ]; then
ln -rsf conf src/vitis/client/conf
fi
-if ! [ -f "conf/closure" ]; then
+if ! [ -e "conf/closure" ]; then
ln -rsf src/closure/conf conf/closure
fi
@@ -45,22 +46,22 @@ if [[ $depsCount > 0 ]]; then
module=${aDeps[$i, name]:7}
echo "---- Link module_${module} ----"
if [ -d "$(pwd)/src/module_${module}/module" ]; then
- if ! [ -f "src/vitis/client/modules/${module}" ]; then
+ if ! [ -e "src/vitis/client/modules/${module}" ]; then
ln -rsf src/module_${module}/module src/vitis/client/modules/${module}
fi
fi
if [ -d "$(pwd)/src/module_${module}/web_service/ws" ]; then
- if ! [ -f "src/vitis/vas/rest/ws/${module}" ]; then
+ if ! [ -e "src/vitis/vas/rest/ws/${module}" ]; then
ln -rsf src/module_${module}/web_service/ws src/vitis/vas/rest/ws/${module}
fi
fi
if [ -d "$(pwd)/src/module_${module}/web_service/conf" ]; then
- if ! [ -f "src/vitis/vas/rest/conf/${module}" ]; then
+ if ! [ -e "src/vitis/vas/rest/conf/${module}" ]; then
ln -rsf src/module_${module}/web_service/conf src/vitis/vas/rest/conf/${module}
fi
fi
if [ -d "$(pwd)/src/module_${module}/web_service/sql" ]; then
- if ! [ -f "src/vitis/vas/sql/${module}" ]; then
+ if ! [ -e "src/vitis/vas/sql/${module}" ]; then
ln -rsf src/module_${module}/web_service/sql src/vitis/vas/sql/${module}
fi
fi
@@ -68,7 +69,7 @@ if [[ $depsCount > 0 ]]; then
for class_dir in $( ls "$(pwd)/src/module_${module}/web_service/class"); do
if [ -d "$(pwd)/src/module_${module}/web_service/class/${class_dir}" ]; then
echo "---- Link module_${module}/${class_dir} ----"
- if ! [ -f "src/vitis/vas/rest/class/${class_dir}" ]; then
+ if ! [ -e "src/vitis/vas/rest/class/${class_dir}" ]; then
ln -rsf src/module_${module}/web_service/class/${class_dir} src/vitis/vas/rest/class/${class_dir}
fi
fi
--
GitLab