Improve SALOME installation Wizard: uniform the platform definition way for batch...

diff --git a/runInstall b/runInstall
index 6855bda6081e4bdaa9f4f938f50cd68f7994e712..bb730125a33213e2d7535e9e4c3dd3581d674ae0 100755 (executable)
--- a/runInstall
+++ b/runInstall
@@ -987,7 +987,7 @@ def get_os_release():
                 # workaround for Mandrake and other platforms
                 plt_name = plt_name.replace("Linux", "").replace("linux", "").replace("LINUX", "").strip()
                 # workaround for SuSe
-                plt_name = plt_name.replace("Welcometo", "").strip()
+                plt_name = plt_name.replace("Welcome to", "").strip()
                 # ---
                 plt_name = " ".join(plt_name.split())
                 plt_ver  = res.group(len(res.groups()))

diff --git a/src/SALOME_InstallWizard.cxx b/src/SALOME_InstallWizard.cxx
index f626067add0e38abefc5ad9cce99554eefcac0a1..6e2fe588d08c622b06bc7fae0e05075bdb07e88a 100644 (file)
--- a/src/SALOME_InstallWizard.cxx
+++ b/src/SALOME_InstallWizard.cxx
@@ -674,7 +674,7 @@ QStringList SALOME_InstallWizard::currentPlatform()
        // retrieve platform name
        platName = QStringList::split( " ", name.join( " " ) ).join( " " );
        platName = platName.replace( "Linux", "" ).replace( "linux", "" ).replace( "LINUX", "" ).stripWhiteSpace();
-       platName = platName.replace( "Welcometo", "" ).stripWhiteSpace();
+       platName = platName.replace( "Welcome to", "" ).stripWhiteSpace();
         platName = QStringList::split( " ", platName ).join( " " );
        // retrieve platform version number
        platVersion = regvar.cap( regvar.numCaptures() );