From 38ba680963b57543872363cbe47cd3c8f0aa7b0c Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Thu, 27 Sep 2018 10:27:52 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20messages=20shell?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
utils/init_subtrees.sh | 4 ++--
utils/init_symlinks.sh | 6 +++---
utils/pull_subtrees.sh | 4 ++--
utils/push_subtrees.sh | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/utils/init_subtrees.sh b/utils/init_subtrees.sh
index 62c80d33..61a58b0a 100755
--- a/utils/init_subtrees.sh
+++ b/utils/init_subtrees.sh
@@ -16,12 +16,12 @@ rm -Rf src
mkdir src
# Vitis
-echo "---- INIT Vitis ----"
+echo "---- Init vitis ----"
git subtree add --prefix src/vitis "git@vm09.veremes.net:Development/vitis_apps/sources/vitis.git" master
# Modules
for module in "${APP_MODULES[@]}"; do
- echo "---- INIT ${module} ----"
+ echo "---- Init module_${module} ----"
# Ajoute le dépôt
git subtree add --prefix src/module_${module} "git@vm09.veremes.net:Development/vitis_apps/sources/module_${module}.git" master
diff --git a/utils/init_symlinks.sh b/utils/init_symlinks.sh
index 7fd92df4..11e27f6e 100755
--- a/utils/init_symlinks.sh
+++ b/utils/init_symlinks.sh
@@ -18,7 +18,7 @@ APP_MODULES=( vmap vm4ms anc cadastre cadastreV2 )
cd ..
# Vitis
-echo "---- Link Vitis ----"
+echo "---- Link vitis ----"
ln -rsf src/vitis/client client
ln -rsf src/vitis/vas vas
echo "client" >> .gitignore
@@ -31,7 +31,7 @@ echo "src/vitis/client/conf" >> .gitignore
# Modules
for module in "${APP_MODULES[@]}"; do
- echo "---- Link ${module} ----"
+ echo "---- Link module_${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
@@ -51,7 +51,7 @@ for module in "${APP_MODULES[@]}"; do
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} ----"
+ echo "---- Link module_${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
diff --git a/utils/pull_subtrees.sh b/utils/pull_subtrees.sh
index 8f3d1ec0..1158e63b 100755
--- a/utils/pull_subtrees.sh
+++ b/utils/pull_subtrees.sh
@@ -14,12 +14,12 @@ APP_MODULES=( vmap vm4ms anc cadastre cadastreV2 )
cd ..
# Vitis
-echo "---- INIT Vitis ----"
+echo "---- Pull vitis ----"
git subtree pull --prefix src/vitis "git@vm09.veremes.net:Development/vitis_apps/sources/vitis.git" master
# Modules
for module in "${APP_MODULES[@]}"; do
- echo "---- INIT ${module} ----"
+ echo "---- Pull module_${module} ----"
# Ajoute le dépôt
git subtree pull --prefix src/module_${module} "git@vm09.veremes.net:Development/vitis_apps/sources/module_${module}.git" master
diff --git a/utils/push_subtrees.sh b/utils/push_subtrees.sh
index e108ad3e..665ed8fd 100755
--- a/utils/push_subtrees.sh
+++ b/utils/push_subtrees.sh
@@ -14,12 +14,12 @@ APP_MODULES=( vmap vm4ms anc cadastre cadastreV2 )
cd ..
# Vitis
-echo "---- INIT Vitis ----"
+echo "---- Push vitis ----"
git subtree push --prefix src/vitis "git@vm09.veremes.net:Development/vitis_apps/sources/vitis.git" master
# Modules
for module in "${APP_MODULES[@]}"; do
- echo "---- INIT ${module} ----"
+ echo "---- Push module_${module} ----"
# Ajoute le dépôt
git subtree push --prefix src/module_${module} "git@vm09.veremes.net:Development/vitis_apps/sources/module_${module}.git" master
--
GitLab