From 139ee7e445d0bcb927fcd76d5f50d8c41562a287 Mon Sep 17 00:00:00 2001 From: ArmandBahi <armand.bahi@veremes.com> Date: Thu, 18 Oct 2018 11:07:14 +0200 Subject: [PATCH] Modify symlinks strategy --- utils/init_symlinks.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/utils/init_symlinks.sh b/utils/init_symlinks.sh index 529bea1a..78fdd17e 100755 --- a/utils/init_symlinks.sh +++ b/utils/init_symlinks.sh @@ -63,10 +63,11 @@ if ! [ -e "$(pwd)/vas" ]; then mkdir vas mkdir vas/rest mkdir vas/rest/conf + mkdir vas/rest/ws ln -rsf src/vitis/vas/doc vas/doc ln -rsf src/vitis/vas/rest/class vas/rest/class ln -rsf src/vitis/vas/rest/inc vas/rest/inc - ln -rsf src/vitis/vas/rest/ws vas/rest/ws + ln -rsf src/vitis/vas/rest/ws/vitis vas/rest/ws/vitis ln -rsf src/vitis/vas/rest/index.phtml vas/rest/index.phtml ln -rsf src/vitis/vas/rest/index.vhtml vas/rest/index.vhtml ln -rsf src/vitis/vas/sql vas/sql @@ -91,22 +92,22 @@ if [[ $depsCount > 0 ]]; then echo "---- Link module_${module} ----" if [ -d "$(pwd)/src/module_${module}/module" ]; then if ! [ -e "src/vitis/client/modules/${module}" ]; then - ln -rsf src/module_${module}/module src/vitis/client/modules/${module} + ln -rsf src/module_${module}/module client/modules/${module} fi fi if [ -d "$(pwd)/src/module_${module}/web_service/ws" ]; then if ! [ -e "src/vitis/vas/rest/ws/${module}" ]; then - ln -rsf src/module_${module}/web_service/ws src/vitis/vas/rest/ws/${module} + ln -rsf src/module_${module}/web_service/ws vas/rest/ws/${module} fi fi # if [ -d "$(pwd)/src/module_${module}/web_service/conf" ]; then # if ! [ -e "src/vitis/vas/rest/conf/${module}" ]; then - # ln -rsf src/module_${module}/web_service/conf src/vitis/vas/rest/conf/${module} + # ln -rsf src/module_${module}/web_service/conf vas/rest/conf/${module} # fi # fi if [ -d "$(pwd)/src/module_${module}/web_service/sql" ]; then if ! [ -e "src/vitis/vas/sql/${module}" ]; then - ln -rsf src/module_${module}/web_service/sql src/vitis/vas/sql/${module} + ln -rsf src/module_${module}/web_service/sql vas/sql/${module} fi fi if [ -d "$(pwd)/src/module_${module}/web_service/class" ]; then @@ -114,7 +115,7 @@ if [[ $depsCount > 0 ]]; then if [ -d "$(pwd)/src/module_${module}/web_service/class/${class_dir}" ]; then echo "---- Link module_${module}/${class_dir} ----" 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} + ln -rsf src/module_${module}/web_service/class/${class_dir} vas/rest/class/${class_dir} fi fi done -- GitLab