From 40be9d2cad99ef0da5a6dca2291d4d62784ab8a6 Mon Sep 17 00:00:00 2001
From: "Wei,Shuai" <swei@linx-info.com>
Date: Thu, 28 Aug 2014 16:01:52 +0800
Subject: [PATCH] =?UTF-8?q?=09=E7=94=B1=E4=BA=8E=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=90=8E=E5=8F=91=E7=8E=B0=E9=97=AE=E9=A2=98=E8=BE=83=E5=A4=9A?=
 =?UTF-8?q?=EF=BC=8C=E8=80=8C=E5=8F=88=E6=80=A5=E4=BA=8E=E5=8F=91=E7=9B=98?=
 =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=B0=86=E4=B9=8B=E5=89=8D=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=BF=98=E5=8E=9F=EF=BC=8C=E4=BB=A5=E5=90=8E=20=09=E5=86=8D?=
 =?UTF-8?q?=E5=BE=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	modified:   operation/finish_install/exec_install_lib_32.sh
	modified:   operation/install_pkg.sh

	Signed-off-by: Wei,Shuai <swei@linx-info.com>
---
 .../finish_install/exec_install_lib_32.sh      | 18 +++++-------------
 operation/install_pkg.sh                       |  2 +-
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/operation/finish_install/exec_install_lib_32.sh b/operation/finish_install/exec_install_lib_32.sh
index 3ebda2b..07fdba6 100644
--- a/operation/finish_install/exec_install_lib_32.sh
+++ b/operation/finish_install/exec_install_lib_32.sh
@@ -2,27 +2,19 @@
 
 # install lib 32 pkgs scripts
 #
-INSTALL_LOG_DIR="/var/log/installer/"
-LOG="$INSTALL_LOG_DIR/install_lib_32.log"
-
 lib_32_pkg_dir="/pkg_lib_i686"
 
-if [ ! -e $INSTALL_LOG_DIR ];then
-	mkdir -p $INSTALL_LOG_DIR
-fi
-
 for pkg in  $(ls ${lib_32_pkg_dir})
 do
     pkgname=$(echo $pkg |cut -d'#' -f1)
     if [ $pkgname = 'pango_i686_lib' -o $pkgname = 'gtk2_i686_lib' ];then
 	continue
     fi
-	echo "install ${pkg_name}..." 1>>$LOG 2>&1
-    pkgadd ${lib_32_pkg_dir}/$pkg 1>>$LOG 2>&1
+    pkgadd -f ${lib_32_pkg_dir}/$pkg
 done
 
-echo "install pango_i686_lib..." 1>>$LOG 2>&1
-pkgadd ${lib_32_pkg_dir}/pango_i686_lib#* 1>>$LOG 2>&1
+pkgadd -f ${lib_32_pkg_dir}/pango_i686_lib#*
 
-echo "install gtk2_i686_lib..." 1>>$LOG 2>&1
-pkgadd ${lib_32_pkg_dir}/gtk2_i686_lib#* 1>>$LOG 2>&1
+pkgadd -f ${lib_32_pkg_dir}/gtk2_i686_lib#*
+
+echo -e "Install 32-lib successfully !"
diff --git a/operation/install_pkg.sh b/operation/install_pkg.sh
index 155ab3d..60ad5aa 100755
--- a/operation/install_pkg.sh
+++ b/operation/install_pkg.sh
@@ -104,7 +104,7 @@ add_pkg ()
 
 	local pkg_src=$1
 
-	pkgadd -r $TARGET $pkg_src 1>>$DEV_LOG 2>&1
+	pkgadd -f -r $TARGET $pkg_src 1>>$DEV_LOG 2>&1
 }
 
 install_pkg ()