From 13a72784ef8edc5c219f78479e7d8be911265f46 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Tue, 3 Apr 2012 17:59:06 +0200 Subject: [PATCH] - don't print "installing .pkg.tar.xz" --- init_buildsystem | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/init_buildsystem b/init_buildsystem index 180ce37..53bd5e8 100755 --- a/init_buildsystem +++ b/init_buildsystem @@ -951,19 +951,20 @@ for PKG in $PACKAGES_TO_INSTALL_FIRST RUN_LDCONFIG $PACKAGES_TO_INSTALL $PACKAGE if test $PSUF = arch ; then test -L $BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF || continue - if ! test "$BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF" -ef "$BUILD_ROOT/.init_b_cache/$PKG.$PSUF" ; then - rm -f $BUILD_ROOT/.init_b_cache/$PKG.$PSUF - cp $BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF $BUILD_ROOT/.init_b_cache/$PKG.$PSUF || cleanup_and_exit 1 - fi - PKGID=`readlink $BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF` - PKGID="${PKGID##*/}" - PKGID="${PKGID%.$PSUF}" - echo "installing ${PKGID%_*}" + if ! test "$BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF" -ef "$BUILD_ROOT/.init_b_cache/$PKG.$PSUF" ; then + rm -f $BUILD_ROOT/.init_b_cache/$PKG.$PSUF + cp $BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF $BUILD_ROOT/.init_b_cache/$PKG.$PSUF || cleanup_and_exit 1 + fi + PKGID=`readlink $BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF` + PKGID="${PKGID##*/}" + PKGID="${PKGID/%.pkg.tar.?z/.arch}" + PKGID="${PKGID%.$PSUF}" + echo "installing ${PKGID%_*}" # -d -d disables deps checking ( chroot $BUILD_ROOT pacman -Uf -d -d --noconfirm .init_b_cache/$PKG.$PSUF 2>&1 || touch $BUILD_ROOT/exit ) | \ perl -ne '$|=1;/^(warning: could not get filesystem information for |loading packages|looking for inter-conflicts|Targets |Total Installed Size: |Net Upgrade Size: |Proceed with installation|checking package integrity|loading package files|checking available disk space|installing |upgrading |warning:.*is up to date -- reinstalling|Optional dependencies for| )/||/^$/||print' check_exit - echo "$PKGID $PSUF" > $BUILD_ROOT/installed-pkg/$PKG + echo "$PKGID $PSUF" > $BUILD_ROOT/installed-pkg/$PKG continue fi -- 2.7.4