Updated copyright comment

[modules/kernel.git] / bin / appliskel / runRemote.sh

diff --git a/bin/appliskel/runRemote.sh b/bin/appliskel/runRemote.sh
index f00ea447719a4fdf25ba247a7da24a15c03d0460..69ea196281526685d1aa41de7da97278437e8490 100755 (executable)
--- a/bin/appliskel/runRemote.sh
+++ b/bin/appliskel/runRemote.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -7,7 +7,7 @@
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -35,47 +35,52 @@
 # ssh cli76ce ${APPLI}/runRemote.sh cli76cd 2810 SALOME_Container myContainerName
 # --- local arguments
 #     $0 : ${APPLI}/runRemote.sh: from arg name, rebuild and export $APPLI variable
+#     --noenvd : optional argument. If present, the envd file is NOT sourced.
 #     $1 : computer name for CORBA name service (where SALOME was launched)
 #     $2 : port for CORBA name service
 #     $3 : WORKINGDIR (if $3 == WORKINDIR a working dir is given in $4. If not the working dir is $HOME)
 #     $4 : if $3 == WORKINGDIR, the path to the workingdir
 #     $5 (or $3 if no workingdir given) and following : local command to execute, with args
+
 # --- retrieve APPLI path, relative to $HOME, set ${APPLI}
 
-APPLI_HOME=`dirname $0`
-export APPLI=`${APPLI_HOME}/getAppliPath.py`
+APPLI_HOME=$(dirname "$0")
+export APPLI=$("${APPLI_HOME}/getAppliPath.py")
 
 # --- set the SALOME environment (prerequisites, MODULES_ROOT_DIR...)
+# Sourcing files with parameters works with bash, not with dash. This is why
+# we must use bash for this script.
 
-. ${HOME}/${APPLI}/envd ${HOME}/${APPLI}
+if [ "$1" == "--noenvd" ]
+then
+  shift
+else
+  . "${HOME}/${APPLI}/envd" "${HOME}/${APPLI}"
+fi
 
 # --- set the OMNIORB_CONFIG file and environment relative to this run of SALOME
 export NSHOST=$1
 export NSPORT=$2
 
-# Get (in bash) the configuration filename from (Python) ORBConfigFile return values
-RETURN_VALUES=$(${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python ${KERNEL_ROOT_DIR}/bin/salome/ORBConfigFile.py ${HOME}/${APPLI}/USERS ${NSHOST} ${NSPORT} with_username=${USER})
-export OMNIORB_CONFIG=$(echo ${RETURN_VALUES} | cut -d' ' -f1)
-
 #go to the requested working directory if any
 if test "x$3" == "xWORKINGDIR"; then
   if test "x$4" = "x\$TEMPDIR"; then
     #create a temp working dir and change to it
-    WDIR=`mktemp -d` && {
-      cd $WDIR
+    WDIR=$(mktemp -d) && {
+      cd "$WDIR"
     }
   else
-    if test -d $4; then
+    if test -d "$4"; then
       #the dir exists, go to it
-      cd $4
+      cd "$4"
     else
-      if test -a $4; then
+      if test -a "$4"; then
         # It's a file do nothing
-        echo $4 "is an existing file. Can't use it as a working directory"
+        echo "$4 is an existing file. Can't use it as a working directory"
       else
         #It does not exists, create it
-        mkdir -p $4 && {
-          cd $4
+        mkdir -p "$4" && {
+          cd "$4"
         }
       fi
     fi
@@ -85,9 +90,13 @@ else
   shift 2
 fi
 
+# Get (in bash) the configuration filename from (Python) ORBConfigFile return values
+RETURN_VALUES=$("${KERNEL_ROOT_DIR}/bin/salome/envSalome.py" python "${KERNEL_ROOT_DIR}/bin/salome/ORBConfigFile.py" "${OMNIORB_USER_PATH}" "${NSHOST}" "${NSPORT}" "with_username=${USER}")
+export OMNIORB_CONFIG=$(echo "${RETURN_VALUES}" | cut -d' ' -f1)
+
 # --- execute the command in the SALOME environment
 
 
 # suppress --rcfile option because of problem on Mandriva2006 - B Secher mai 2007
 #${KERNEL_ROOT_DIR}/bin/salome/envSalome.py /bin/sh --rcfile $HOME/$APPLI/.bashrc -c "$*"
-${KERNEL_ROOT_DIR}/bin/salome/envSalome.py /bin/sh -c "$*"
+"${KERNEL_ROOT_DIR}/bin/salome/envSalome.py" /bin/sh -c "$*"