diff --git a/pull_subtrees.sh b/pull_subtrees.sh index 70e19883f2ae6c7904adc2c33877b26419aeb1da..d9bc20cf9cd259704bdfb8e563ff8a3c0f2f78da 100755 --- a/pull_subtrees.sh +++ b/pull_subtrees.sh @@ -1,9 +1,7 @@ #!/bin/bash # # -# Script d'initialisation d'un dépot vMap versionné sous git -# Initislise l'ensemble des dépendances sous forme de subtrees -# Crée des symlinks pour re-créer l'arborescence de l'application +# Récupère les modifications des modules sur l'application # # diff --git a/push_subtrees.sh b/push_subtrees.sh new file mode 100644 index 0000000000000000000000000000000000000000..098911317857e59aa0e87fb002942c61ddfbc2c1 --- /dev/null +++ b/push_subtrees.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# +# +# Envoie les modifications de l'application sur les modules +# +# + +if [ `whoami` == "root" ]; then + echo "Please, do not run this script as sudo" +else + cd utils/ + ./push_subtrees.sh +fi diff --git a/utils/githooks/post-merge b/utils/githooks/post-merge index 548e6ae56f6a55c2d1acab88308e336c06e71616..45b38b216aa67e69223d8bea9440665e898168f2 100755 --- a/utils/githooks/post-merge +++ b/utils/githooks/post-merge @@ -9,10 +9,11 @@ # echo "****** Post-merge Hook ******" -echo "****** Pull subtrees ******" -echo "$(pwd)" - -if [ -d "$(pwd)/utils" ]; then - cd utils - ./pull_subtrees.sh -fi +echo "****** Pull ******" +# echo "****** Pull subtrees ******" +# echo "$(pwd)" +# +# if [ -d "$(pwd)/utils" ]; then +# cd utils +# ./pull_subtrees.sh +# fi diff --git a/utils/githooks/pre-push b/utils/githooks/pre-push index 50401f9e2df8033763628124e1445afe66e9bad5..c5e4e9536803f05a55dce10289d9bd9299350a7d 100755 --- a/utils/githooks/pre-push +++ b/utils/githooks/pre-push @@ -13,9 +13,10 @@ url="$2" if [ $remote != $url ]; then echo "****** Pre-push Hook ******" - echo "****** Push subtrees ******" - if [ -d "$(pwd)/utils" ]; then - cd utils - ./push_subtrees.sh - fi + echo "****** Push ******" + # echo "****** Push subtrees ******" + # if [ -d "$(pwd)/utils" ]; then + # cd utils + # ./push_subtrees.sh + # fi fi