From 13b9cebd31ed9de91eb77f0a341f3f25188be323 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Wed, 26 Sep 2018 17:39:10 +0200
Subject: [PATCH] Move shell scripts
---
init_vmap_symlinks.sh | 59 -------------------
.../init_vmap_subtrees.sh | 10 ++--
utils/init_vmap_symlinks.sh | 59 +++++++++++++++++++
3 files changed, 64 insertions(+), 64 deletions(-)
delete mode 100755 init_vmap_symlinks.sh
rename init_vmap_subtrees.sh => utils/init_vmap_subtrees.sh (51%)
create mode 100755 utils/init_vmap_symlinks.sh
diff --git a/init_vmap_symlinks.sh b/init_vmap_symlinks.sh
deleted file mode 100755
index 438014b2..00000000
--- a/init_vmap_symlinks.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-#
-#
-# Script d'initialisation d'un dépot vMap versionné sous git
-#
-# Split repo
-# git subtree split -P module/ -b module_split_branch
-#
-# Add subtree
-# git subtree add --prefix vmap "git@vm09.veremes.net:Development/vitis_apps/sources/Vitis.git" master
-#
-#
-
-
-APP_NAME="vmap"
-APP_MODULES=( vmap vm4ms anc cadastre cadastreV2 )
-
-
-# Vitis
-echo "---- Link Vitis ----"
-ln -rsf deps/vitis/client client
-ln -rsf deps/vitis/vas vas
-echo "client" >> .gitignore
-echo "vas" >> .gitignore
-
-# Conf
-echo "---- Link ${APP_NAME}/conf ----"
-ln -rsf deps/app_${APP_NAME}/conf deps/vitis/client/conf
-echo "deps/vitis/client/conf" >> .gitignore
-
-# Modules
-for module in "${APP_MODULES[@]}"; do
- echo "---- Link ${module} ----"
- if [ -d "$(pwd)/deps/module_${module}/module" ]; then
- ln -rsf deps/module_${module}/module deps/vitis/client/modules/${module}
- echo "deps/vitis/client/modules/${module}" >> .gitignore
- fi
- if [ -d "$(pwd)/deps/module_${module}/web_service/ws" ]; then
- ln -rsf deps/module_${module}/web_service/ws deps/vitis/vas/rest/ws/${module}
- echo "deps/vitis/vas/rest/ws/${module}" >> .gitignore
- fi
- if [ -d "$(pwd)/deps/module_${module}/web_service/conf" ]; then
- ln -rsf deps/module_${module}/web_service/conf deps/vitis/vas/rest/conf/${module}
- echo "deps/vitis/vas/rest/conf/${module}" >> .gitignore
- fi
- if [ -d "$(pwd)/deps/module_${module}/web_service/sql" ]; then
- ln -rsf deps/module_${module}/web_service/conf deps/vitis/vas/sql/${module}
- echo "deps/vitis/vas/sql/${module}" >> .gitignore
- fi
- if [ -d "$(pwd)/deps/module_${module}/web_service/class" ]; then
- for class_dir in $( ls "$(pwd)/deps/module_${module}/web_service/class"); do
- if [ -d "$(pwd)/deps/module_${module}/web_service/class/${class_dir}" ]; then
- echo "---- Link ${module}/${class_dir} ----"
- ln -rsf deps/module_${module}/web_service/class/${class_dir} deps/vitis/vas/rest/class/${class_dir}
- echo "deps/vitis/vas/rest/class/${class_dir}" >> .gitignore
- fi
- done
- fi
-done
diff --git a/init_vmap_subtrees.sh b/utils/init_vmap_subtrees.sh
similarity index 51%
rename from init_vmap_subtrees.sh
rename to utils/init_vmap_subtrees.sh
index 61f8132b..2e610039 100755
--- a/init_vmap_subtrees.sh
+++ b/utils/init_vmap_subtrees.sh
@@ -11,21 +11,21 @@
APP_NAME="vmap"
APP_MODULES=( vmap vm4ms anc cadastre cadastreV2 )
-rm -Rf deps
-mkdir deps
+rm -Rf src
+mkdir src
# Vitis
echo "---- INIT Vitis ----"
-git subtree add --prefix deps/vitis "git@vm09.veremes.net:Development/vitis_apps/sources/vitis.git" master
+git subtree add --prefix src/vitis "git@vm09.veremes.net:Development/vitis_apps/sources/vitis.git" master
# Conf
echo "---- INIT $APP_NAME conf ----"
-git subtree add --prefix deps/app_${APP_NAME} "git@vm09.veremes.net:Development/vitis_apps/sources/app_${APP_NAME}.git" master
+git subtree add --prefix src/app_${APP_NAME} "git@vm09.veremes.net:Development/vitis_apps/sources/app_${APP_NAME}.git" master
# Modules
for module in "${APP_MODULES[@]}"; do
echo "---- INIT ${module} ----"
# Ajoute le dépôt
- git subtree add --prefix deps/module_${module} "git@vm09.veremes.net:Development/vitis_apps/sources/module_${module}.git" master
+ git subtree add --prefix src/module_${module} "git@vm09.veremes.net:Development/vitis_apps/sources/module_${module}.git" master
done
diff --git a/utils/init_vmap_symlinks.sh b/utils/init_vmap_symlinks.sh
new file mode 100755
index 00000000..c5d7172d
--- /dev/null
+++ b/utils/init_vmap_symlinks.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+#
+#
+# Script d'initialisation d'un dépot vMap versionné sous git
+#
+# Split repo
+# git subtree split -P module/ -b module_split_branch
+#
+# Add subtree
+# git subtree add --prefix vmap "git@vm09.veremes.net:Development/vitis_apps/sources/Vitis.git" master
+#
+#
+
+
+APP_NAME="vmap"
+APP_MODULES=( vmap vm4ms anc cadastre cadastreV2 )
+
+
+# Vitis
+echo "---- Link Vitis ----"
+ln -rsf src/vitis/client client
+ln -rsf src/vitis/vas vas
+echo "client" >> .gitignore
+echo "vas" >> .gitignore
+
+# Conf
+echo "---- Link ${APP_NAME}/conf ----"
+ln -rsf src/app_${APP_NAME}/conf src/vitis/client/conf
+echo "src/vitis/client/conf" >> .gitignore
+
+# Modules
+for module in "${APP_MODULES[@]}"; do
+ echo "---- Link ${module} ----"
+ if [ -d "$(pwd)/src/module_${module}/module" ]; then
+ ln -rsf src/module_${module}/module src/vitis/client/modules/${module}
+ echo "src/vitis/client/modules/${module}" >> .gitignore
+ fi
+ if [ -d "$(pwd)/src/module_${module}/web_service/ws" ]; then
+ ln -rsf src/module_${module}/web_service/ws src/vitis/vas/rest/ws/${module}
+ echo "src/vitis/vas/rest/ws/${module}" >> .gitignore
+ fi
+ if [ -d "$(pwd)/src/module_${module}/web_service/conf" ]; then
+ ln -rsf src/module_${module}/web_service/conf src/vitis/vas/rest/conf/${module}
+ echo "src/vitis/vas/rest/conf/${module}" >> .gitignore
+ fi
+ if [ -d "$(pwd)/src/module_${module}/web_service/sql" ]; then
+ ln -rsf src/module_${module}/web_service/conf src/vitis/vas/sql/${module}
+ echo "src/vitis/vas/sql/${module}" >> .gitignore
+ fi
+ if [ -d "$(pwd)/src/module_${module}/web_service/class" ]; 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}/${class_dir} ----"
+ ln -rsf src/module_${module}/web_service/class/${class_dir} src/vitis/vas/rest/class/${class_dir}
+ echo "src/vitis/vas/rest/class/${class_dir}" >> .gitignore
+ fi
+ done
+ fi
+done
--
GitLab