linx/new_install
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复bug2012，安装软件包，出现目录冲突却没有报错的问题

Browse Source 
将pkgadd -f改为pkgadd

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

	Signed-off-by: Wei,Shuai <swei@linx-info.com>
This commit is contained in:
Wei,Shuai
2014-08-28 14:10:07 +08:00
parent 1c1565d4b2
commit f8ee3637ab
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
operation/finish_install/exec_install_lib_32.sh
View File

@@ -2,19 +2,27 @@
# 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
pkgadd -f ${lib_32_pkg_dir}/$pkg
echo "install ${pkg_name}..." 1>>$LOG 2>&1
pkgadd ${lib_32_pkg_dir}/$pkg 1>>$LOG 2>&1
done
pkgadd -f ${lib_32_pkg_dir}/pango_i686_lib#*
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}/gtk2_i686_lib#*
echo -e "Install 32-lib successfully !"
echo "install gtk2_i686_lib..." 1>>$LOG 2>&1
pkgadd ${lib_32_pkg_dir}/gtk2_i686_lib#* 1>>$LOG 2>&1

2
operation/install_pkg.sh
View File

@@ -104,7 +104,7 @@ add_pkg ()
local pkg_src=$1
pkgadd -f -r $TARGET $pkg_src 1>>$DEV_LOG 2>&1
pkgadd -r $TARGET $pkg_src 1>>$DEV_LOG 2>&1
}
install_pkg ()