From 72c365b05b93d9cd12dc80c194bbbd2fec9f15fa Mon Sep 17 00:00:00 2001 From: HAYASHI Kentaro Date: Tue, 21 Aug 2012 14:22:06 +0900 Subject: [PATCH] apt yum: check the existence of chroot directory --- packages/check-utility.sh | 110 ++++++++++++++++++++++---------------- 1 file changed, 65 insertions(+), 45 deletions(-) diff --git a/packages/check-utility.sh b/packages/check-utility.sh index bcd28de255..6658dc597c 100755 --- a/packages/check-utility.sh +++ b/packages/check-utility.sh @@ -105,12 +105,14 @@ EOF for code in $CODES; do for arch in $DEB_ARCHITECTURES; do root_dir=$CHROOT_ROOT/$code-$arch - CHECK_SCRIPT=check-deb-groonga.sh - echo "copy check script $CHECK_SCRIPT to $root_dir/tmp" - sudo rm -f $root_dir/tmp/$CHECK_SCRIPT - cp $CHECK_SCRIPT $root_dir/tmp - sudo chmod 755 $root_dir/tmp/$CHECK_SCRIPT - sudo chname $code-$arch chroot $root_dir /tmp/$CHECK_SCRIPT + if [ -d $root_dir ]; then + CHECK_SCRIPT=check-deb-groonga.sh + echo "copy check script $CHECK_SCRIPT to $root_dir/tmp" + sudo rm -f $root_dir/tmp/$CHECK_SCRIPT + cp $CHECK_SCRIPT $root_dir/tmp + sudo chmod 755 $root_dir/tmp/$CHECK_SCRIPT + sudo chname $code-$arch chroot $root_dir /tmp/$CHECK_SCRIPT + fi done done for dist in $DISTRIBUTIONS; do @@ -126,11 +128,13 @@ EOF for arch in $RPM_ARCHITECTURES; do CHECK_SCRIPT=check-rpm-groonga.sh root_dir=$CHROOT_ROOT/$dist-$ver-$arch - echo "copy check script $CHECK_SCRIPT to $root_dir/tmp" - sudo rm -f $root_dir/tmp/$CHECK_SCRIPT - cp $CHECK_SCRIPT $root_dir/tmp - sudo chmod 755 $root_dir/tmp/$CHECK_SCRIPT - sudo chname $code-$ver-$arch chroot $root_dir /tmp/$CHECK_SCRIPT + if [ -d $root_dir ]; then + echo "copy check script $CHECK_SCRIPT to $root_dir/tmp" + sudo rm -f $root_dir/tmp/$CHECK_SCRIPT + cp $CHECK_SCRIPT $root_dir/tmp + sudo chmod 755 $root_dir/tmp/$CHECK_SCRIPT + sudo chname $code-$ver-$arch chroot $root_dir /tmp/$CHECK_SCRIPT + fi done done done @@ -174,11 +178,13 @@ EOF INSTALL_SCRIPT=install-aptget-groonga.sh ;; esac - echo "copy install script $INSTALL_SCRIPT to $root_dir/tmp" - sudo rm -f $root_dir/tmp/$INSTALL_SCRIPT - cp $INSTALL_SCRIPT $root_dir/tmp - chmod 755 $root_dir/tmp/$INSTALL_SCRIPT - sudo chname $code-$arch chroot $root_dir /tmp/$INSTALL_SCRIPT + if [ -d $root_dir ]; then + echo "copy install script $INSTALL_SCRIPT to $root_dir/tmp" + sudo rm -f $root_dir/tmp/$INSTALL_SCRIPT + cp $INSTALL_SCRIPT $root_dir/tmp + chmod 755 $root_dir/tmp/$INSTALL_SCRIPT + sudo chname $code-$arch chroot $root_dir /tmp/$INSTALL_SCRIPT + fi done done cat > install-centos5-groonga.sh <