From 691aad3259427bb6138229fb6d799e6c17b27a24 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 16 Oct 2008 08:47:47 +0000 Subject: [PATCH] Improve SALOME installation Wizard: uniform the platform definition way for batch and GUI modes for all supported platforms plus fix bug of platform definition for 64bit platforms --- runInstall | 2 +- src/SALOME_InstallWizard.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runInstall b/runInstall index 6855bda..bb73012 100755 --- 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 f626067..6e2fe58 100644 --- 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() ); -- 2.39.2