diff --git a/utils/init_symlinks.sh b/utils/init_symlinks.sh index 6aecc5acce6afbd4714358ee70732f96f67763b8..217081b5183c9fd2eded79405d69dede6c74a7ee 100755 --- a/utils/init_symlinks.sh +++ b/utils/init_symlinks.sh @@ -20,12 +20,6 @@ read APP_EXISTING_PATH cd .. # Supprime les anciens symlinks -if [ -e "client" ]; then - rm client -fi -if [ -e "vas" ]; then - rm vas -fi if [ -d "client" ]; then rm -Rf client fi @@ -39,7 +33,6 @@ find src/vitis/vas/rest -type l -delete # Vitis echo "---- Link vitis ----" if ! [ -e "$(pwd)/client" ]; then - # ln -rsf src/vitis/client client mkdir client mkdir client/javascript @@ -58,11 +51,9 @@ if ! [ -e "$(pwd)/client" ]; then ln -rsf src/vitis/client/index.html client/index.html fi if ! [ -e "$(pwd)/vas" ]; then -# ln -rsf src/vitis/vas vas 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 @@ -100,11 +91,6 @@ if [[ $depsCount > 0 ]]; then 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 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 vas/sql/${module} @@ -129,6 +115,7 @@ if [[ $depsCount > 0 ]]; then echo "---- Link exixting app ${APP_EXISTING_PATH} ----" declare -a existing_folders_path=("vas/server" + "vas/rest/conf" "vas/log" "vas/public" "vas/shared" @@ -144,11 +131,6 @@ if [[ $depsCount > 0 ]]; then done declare -a existing_files_path=("client/conf/properties.json" - "vas/rest/conf/properties.inc" - "vas/rest/conf/properties_domain.inc" - "vas/rest/conf/properties_post.inc" - "vas/rest/conf/properties_server.inc" - "vas/rest/conf/version.inc" "vas/rest/.htaccess") for file_path in "${existing_files_path[@]}"; do if [ -f "${APP_EXISTING_PATH}/$file_path" ]; then @@ -159,8 +141,8 @@ if [[ $depsCount > 0 ]]; then for properties_dir in $( ls "${APP_EXISTING_PATH}/vas/rest/conf"); do if [ -d "${APP_EXISTING_PATH}/vas/rest/conf/${properties_dir}" ]; then - echo "copy ${APP_EXISTING_PATH}/vas/rest/conf/${properties_dir}/ > $(pwd)/vas/rest/conf/${properties_dir}" - cp -Rf "${APP_EXISTING_PATH}/vas/rest/conf/${properties_dir}/" "$(pwd)/vas/rest/conf/${properties_dir}" + echo "copy ${APP_EXISTING_PATH}/vas/rest/conf/${properties_dir}/ > $(pwd)/vas/rest/conf/" + cp -Rf "${APP_EXISTING_PATH}/vas/rest/conf/${properties_dir}/" "$(pwd)/vas/rest/conf/" fi done fi