Improve SALOME style handling

diff --git a/bin/runLightSalome.csh b/bin/runLightSalome.csh
index 39c742dc829a50005f471036ad53112523902d83..e4c8939da3dc2da5417b1effe28b2be1227b222f 100755 (executable)
--- a/bin/runLightSalome.csh
+++ b/bin/runLightSalome.csh
@@ -27,8 +27,16 @@
 # is necessary for loading of .ini or .xml resources file
 ###
 
-if ( ! $?LightAppConfig )    setenv LightAppConfig ${GUI_ROOT_DIR}/share/salome/resources/gui
-if ( ! $?LightAppResources ) setenv LightAppResources ${GUI_ROOT_DIR}/share/salome/resources/gui
+if ( ! ($?LightAppConfig) ) then
+    setenv LightAppConfig ${GUI_ROOT_DIR}/share/salome/resources/gui
+else
+    setenv LightAppConfig ${LightAppConfig}:${GUI_ROOT_DIR}/share/salome/resources/gui
+endif
+if ( ! ($?LightAppResources) ) then
+    setenv LightAppResources ${GUI_ROOT_DIR}/share/salome/resources/gui
+else
+    setenv LightAppResources ${LightAppResources}:${GUI_ROOT_DIR}/share/salome/resources/gui
+endif
 
 ###
 # default settings 
@@ -144,4 +152,4 @@ if ( "${PYTHONPATH}" != "" ) setenv PYTHONPATH ${MY_PYTHONPATH}:${PYTHONPATH}
 # start application
 ###
 
-SUITApp LightApp -style salome $* &
+SUITApp LightApp $* &

diff --git a/bin/runLightSalome.sh b/bin/runLightSalome.sh
index cc2540a04c456aa6b5e3963768afc6b3d8e85eda..3f1eb230ba299ff02c2d981e11581fd0521da65f 100755 (executable)
--- a/bin/runLightSalome.sh
+++ b/bin/runLightSalome.sh
@@ -29,9 +29,13 @@
 
 if [ -z "$LightAppConfig" ] ; then
   export LightAppConfig=${GUI_ROOT_DIR}/share/salome/resources/gui
+else
+  export LightAppConfig=${LightAppConfig}:${GUI_ROOT_DIR}/share/salome/resources/gui
 fi
 if [ -z "$LightAppResources" ] ; then
   export LightAppResources=${GUI_ROOT_DIR}/share/salome/resources/gui
+else
+  export LightAppResources=${LightAppResources}:${GUI_ROOT_DIR}/share/salome/resources/gui
 fi
 
 ###
@@ -142,4 +146,4 @@ fi
 # start application
 ###
 
-SUITApp LightApp -style salome $* &
+SUITApp LightApp $* &