jyma...@adullact.net
unread,Feb 23, 2017, 11:13:14 AM2/23/17Sign in to reply to author
Sign in to forward
You do not have permission to delete messages in this group
Either email addresses are anonymous for this group or you need the view member email addresses permission to view the original message
to openmairie-...@googlegroups.com
Author: jymadier
Date: 2017-02-23 17:13:11 +0100 (Thu, 23 Feb 2017)
New Revision: 270
Modified:
branches/evo_affichage_sans_cumul/
branches/evo_affichage_sans_cumul/tests/init_demoenv
Log:
* Rebase
Index: branches/evo_affichage_sans_cumul
===================================================================
--- branches/evo_affichage_sans_cumul 2017-02-23 16:12:47 UTC (rev 269)
+++ branches/evo_affichage_sans_cumul 2017-02-23 16:13:11 UTC (rev 270)
Property changes on: branches/evo_affichage_sans_cumul
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
-/trunk:254-261
\ No newline at end of property
+/branches/1.16:267-269
+/trunk:254-268
\ No newline at end of property
Modified: branches/evo_affichage_sans_cumul/tests/init_demoenv
===================================================================
--- branches/evo_affichage_sans_cumul/tests/init_demoenv 2017-02-23 16:12:47 UTC (rev 269)
+++ branches/evo_affichage_sans_cumul/tests/init_demoenv 2017-02-23 16:13:11 UTC (rev 270)
@@ -14,14 +14,14 @@
# On se positionne à la racine de l'applicatif
cd ..
-# On cré le lien symbolique qui est utilisé par les tests en fonction de
+# On crée le lien symbolique qui est utilisé par les tests en fonction de
# l'emplacement actuel uniquement si cet emplacement est un lien symbolique
# ou n'existe pas
-if ([ -e $path_tests ] && [ -L $path_tests ]) || ([ ! -e $path_tests ]) ;
+if [ -L $path_tests ] || [ ! -e $path_tests ]
then
- if [ -e $path_tests ] ;
+ if [ -L $path_tests ]
then
- sudo rm $path_tests
+ sudo rm -f $path_tests
fi
path_current=`pwd`
sudo ln -s $path_current $path_tests