From: Jean-Philippe ARGAUD <jean-philippe.argaud@edf.fr>
Date: Wed, 8 Apr 2015 19:26:49 +0000 (+0200)
Subject: Correcting Bash launching advanced example
X-Git-Tag: V7_6_0~21
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=708a42b5b67bcf12f4248d9d4534f149f44306ce;p=modules%2Fadao.git

Correcting Bash launching advanced example
---

diff --git a/doc/en/advanced.rst b/doc/en/advanced.rst
index 2d5c2ab..3671f88 100644
--- a/doc/en/advanced.rst
+++ b/doc/en/advanced.rst
@@ -60,13 +60,11 @@ between these symbols ``<...>``.
 The template of the shell script is the following::
 
     #!/bin/bash
-    export USERDIR=<ADAO JDC file directory>
-    export SALOMEDIR=<SALOME main installation directory>
+    USERDIR=<ADAO JDC file directory>
+    SALOMEDIR=<SALOME main installation directory>
     $SALOMEDIR/salome start -k -t
-    $SALOMEDIR/salome shell python \
-        $SALOMEDIR/bin/salome/AdaoYacsSchemaCreator.py \
-        $USERDIR/<ADAO Python file> $USERDIR/<ADAO YACS xml scheme>
-    $SALOMEDIR/salome shell driver $USERDIR/<ADAO YACS xml scheme>
+    $SALOMEDIR/salome shell -- "python $SALOMEDIR/bin/salome/AdaoYacsSchemaCreator.py $USERDIR/<ADAO Python file> $USERDIR/<ADAO YACS xml scheme>"
+    $SALOMEDIR/salome shell -- "driver $USERDIR/<ADAO YACS xml scheme>"
     $SALOMEDIR/salome shell killSalome.py
     rm -f $USERDIR/<ADAO YACS xml scheme>
 
diff --git a/doc/fr/advanced.rst b/doc/fr/advanced.rst
index 85c900c..9ee07d1 100644
--- a/doc/fr/advanced.rst
+++ b/doc/fr/advanced.rst
@@ -64,13 +64,11 @@ script a seulement besoin de remplacer le texte contenu entre les symboles
 Le modèle "type" de ce script de commandes shell est le suivant::
 
     #!/bin/bash
-    export USERDIR=<Répertoire du fichier JDC ADAO>
-    export SALOMEDIR=<Répertoire principal d'installation de SALOME>
+    USERDIR=<Répertoire du fichier JDC ADAO>
+    SALOMEDIR=<Répertoire principal d'installation de SALOME>
     $SALOMEDIR/salome start -k -t
-    $SALOMEDIR/salome shell python \
-        $SALOMEDIR/bin/salome/AdaoYacsSchemaCreator.py \
-        $USERDIR/<Fichier Python ADAO> $USERDIR/<Schéma xml YACS ADAO>
-    $SALOMEDIR/salome shell driver $USERDIR/<Schéma xml YACS ADAO>
+    $SALOMEDIR/salome shell -- "python $SALOMEDIR/bin/salome/AdaoYacsSchemaCreator.py $USERDIR/<Fichier Python ADAO> $USERDIR/<Schéma xml YACS ADAO>"
+    $SALOMEDIR/salome shell -- "driver $USERDIR/<Schéma xml YACS ADAO>"
     $SALOMEDIR/salome shell killSalome.py
     rm -f $USERDIR/<Schéma xml YACS ADAO>