CWS-TOOLING: integrate CWS native201_DEV300

2 files changed, 13 insertions, 39 deletions

diff --git a/setup_native/scripts/javaloader.sh b/setup_native/scripts/javaloader.sh
index 1bd7e5101e1a..22b1eb927625 100644
--- a/setup_native/scripts/javaloader.sh
+++ b/setup_native/scripts/javaloader.sh
@@ -313,13 +313,19 @@ install_linux_rpm()
     java_runtime=$tempdir/$javahome/bin/java
 
     # Make symbolic links to all TrueType font files installed in the system
-    # to avoid garbles for Japanese
-    language=`printenv LANG | cut -c 1-5`
-    if [ x$language = "xja_JP" ]; then
+    # to avoid garbles for Japanese, Korean or Chinese
+    language=`printenv LANG | cut -c 1-3`
+    if [ x$language = "xja_" -o x$language = "xko_" -o x$language = "xzh_" ]; then
         font_fallback_dir=$javahome/lib/fonts/fallback
         echo "Making symbolic links to TrueType font files into $font_fallback_dir."
         mkdir -p $font_fallback_dir
         ttf_files=`locate "*.ttf" | xargs`
+        if [ x$ttf_files = "x" ]; then
+            ttf_files=`find /usr/share/fonts/ -name "*ttf"`
+            if [ x$ttf_files = "x" ]; then
+                ttf_files=`find /usr/X11R6/lib/ -name "*ttf"`
+            fi
+        fi
         ln -s $ttf_files $font_fallback_dir
     fi
 
diff --git a/setup_native/scripts/linuxpatchscript.sh b/setup_native/scripts/linuxpatchscript.sh
index 0714f676d1b9..33a0d4127301 100644
--- a/setup_native/scripts/linuxpatchscript.sh
+++ b/setup_native/scripts/linuxpatchscript.sh
@@ -11,11 +11,12 @@ fi
 echo
 echo "Searching for the PRODUCTNAMEPLACEHOLDER installation ..."
 
-RPMNAME=`rpm -qa | grep PRODUCTNAMEPLACEHOLDER-core01`
+RPMNAME=`rpm -qa | grep SEARCHPACKAGENAMEPLACEHOLDER`
 
 if [ "x$RPMNAME" != "x" ]
 then
   PRODUCTINSTALLLOCATION="`rpm --query --queryformat "%{INSTALLPREFIX}" $RPMNAME`"
+  FULLPRODUCTINSTALLLOCATION="${PRODUCTINSTALLLOCATION}/PRODUCTDIRECTORYNAME"
 else
   echo "PRODUCTNAMEPLACEHOLDER is not installed"
   exit 1
@@ -23,7 +24,7 @@ fi
 
 # Last chance to exit ..
 echo
-read -p "Patching the installation in ${PRODUCTINSTALLLOCATION}. Continue (y/n) ? " -n 1 reply leftover
+read -p "Patching the installation in ${FULLPRODUCTINSTALLLOCATION}. Continue (y/n) ? " -n 1 reply leftover
 echo
 [ "$reply" == "y" ] || exit 1
 
@@ -39,22 +40,9 @@ do
 done
 
 # Save UserInstallation value
-BOOTSTRAPRC="${PRODUCTINSTALLLOCATION}/program/bootstraprc"
+BOOTSTRAPRC="${FULLPRODUCTINSTALLLOCATION}/program/bootstraprc"
 USERINST=`grep UserInstallation ${BOOTSTRAPRC}`
 
-# Check, if searchtoolbar extension rpm is available
-SEARCHTOOLBARRPM=`ls $BASEDIR/RPMS/*.rpm | grep searchtoolbar`
-
-if [ "x$SEARCHTOOLBARRPM" != "x" ]; then
-  # Check, that $RPMLIST does not contain search toolbar rpm (then it is already installed)
-  SEARCHTOOLBARINSTALLED=`grep searchtoolbar ${RPMLIST}`
-
-  if [ "x$SEARCHTOOLBARINSTALLED" == "x" ]; then
-    # Install the search toolbar rpm
-    RPMLIST="$RPMLIST $SEARCHTOOLBARRPM"
-  fi
-fi
-
 # Check, if kde-integration rpm is available
 KDERPM=`ls $BASEDIR/RPMS/*.rpm | grep kde-integration`
 
@@ -72,26 +60,6 @@ echo
 rpm --upgrade -v --hash --prefix $PRODUCTINSTALLLOCATION --notriggers $RPMLIST
 echo
 
-# Check, if online update rpm is available
-ONLINEUPDATERPM=`ls $BASEDIR/RPMS/*.rpm | grep onlineupdate`
-
-if [ "x$ONLINEUPDATERPM" != "x" ]; then
-  # Check, that $RPMLIST does not contain online update rpm (then it is already installed)
-  ONLINEPDATEINSTALLED=`grep onlineupdate ${RPMLIST}`
-
-  if [ "x$ONLINEPDATEINSTALLED" == "x" ]; then
-    # Ask user, if online update shall be installed
-    echo
-    read -p "Do you want to install the new online update feature (y/n) ? " -n 1 reply leftover
-    echo
-
-    if [ "$reply" == "y" ]; then
-      # Install the online update rpm
-      rpm --install -v --hash --prefix $PRODUCTINSTALLLOCATION --notriggers $ONLINEUPDATERPM
-    fi
-  fi
-fi
-
 # Some RPM versions have problems with -U and --prefix
 if [ ! -f ${BOOTSTRAPRC} ]; then
   echo Update failed due to a bug in RPM, uninstalling ..