[tuleap29134] : fix for runSalomeOld.py the defaut SSL mode in -t context

[modules/kernel.git] / bin / envSalome.py

diff --git a/bin/envSalome.py b/bin/envSalome.py
index e9cbe90a2074efd5a32219a5367cb70933741274..44bb32428bfcef7fb2263596745640bc8410adcc 100755 (executable)
--- a/bin/envSalome.py
+++ b/bin/envSalome.py
@@ -1,6 +1,6 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -8,7 +8,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
@@ -23,13 +23,12 @@
 #
 
 
-##############################################
-############### IMPORTANT NOTE ###############
-##############################################
-# The envSalome.py script is obsolete.       #
-# Please consider the new salome.py command. #
-# More info: cedric.aguerre@edf.fr           #
-##############################################
+###############################################
+############### IMPORTANT NOTE ################
+###############################################
+# The runConsole script is obsolete.          #
+# Please consider the new salome.py launcher. #
+###############################################
 
 
 import os
@@ -37,7 +36,8 @@ import sys
 import setenv
 
 kernel_root=os.getenv("KERNEL_ROOT_DIR")
-sys.path[:0]=[kernel_root+"/bin/salome"]
+kernel_root = os.path.realpath(kernel_root)
+sys.path[:0]=[os.path.join(kernel_root,"bin","salome")]
 
 argv = sys.argv[1:]
 sys.argv = argv[1:]