Fix bugs with Salome launcher jobs

diff --git a/src/Launcher/Launcher_Job_SALOME.cxx b/src/Launcher/Launcher_Job_SALOME.cxx
index 91d94f1e3a0546c3f39d5606d42e19ebc0a517e3..56fc41405c0cfe503d9db1eb844902eafea17275 100644 (file)
--- a/src/Launcher/Launcher_Job_SALOME.cxx
+++ b/src/Launcher/Launcher_Job_SALOME.cxx
@@ -114,10 +114,10 @@ Launcher::Job_SALOME::buildSalomeScript(Batch::Parametre params)
   launch_script_stream << _resource_definition.AppliPath << "/runAppli --terminal --ns-port-log=$NS_PORT_FILE_NAME > logs/salome_" << _launch_date << ".log 2>&1 &&" << std::endl;
   launch_script_stream << "current=0 &&\n"
                        << "stop=20 &&\n"
-                       << "while ! test -f $NS_PORT_FILE_PATH\n"
+                       << "while ! test -s $NS_PORT_FILE_PATH\n"
                        << "do\n"
                        << "  sleep 2\n"
-                       << "  let current=current+1\n"
+                       << "  current=$((current+1))\n"
                        << "  if [ \"$current\" -eq \"$stop\" ] ; then\n"
                        << "    echo Error Naming Service failed ! >&2\n"
                        << "    exit\n"