]> TLD Linux GIT Repositories - packages/rpm-build-tools.git/commitdiff
- fixed when everything went fine
authorBartosz Świątek <shadzik@tld-linux.org>
Tue, 4 Oct 2011 23:18:05 +0000 (01:18 +0200)
committerBartosz Świątek <shadzik@tld-linux.org>
Tue, 4 Oct 2011 23:18:05 +0000 (01:18 +0200)
builder

diff --git a/builder b/builder
index f1d81ba89178a973c8802d0e2c3574d86ee9ea0e..479a0c27d25459111bd3acb959e6f03d52f3158b 100755 (executable)
--- a/builder
+++ b/builder
@@ -1486,7 +1486,7 @@ build_package() {
                fi
        else
                BRLISTFILE=$(tempfile)
                fi
        else
                BRLISTFILE=$(tempfile)
-               eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE 2>$BRLISTFILE
+               eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE
                RETVAL=$?
        fi
        if [ "$RETVAL" -ne "0" ]; then
                RETVAL=$?
        fi
        if [ "$RETVAL" -ne "0" ]; then
@@ -1499,7 +1499,7 @@ build_package() {
                        echo ""
                fi
                # try to nicely show package list, to just copy&paste it to poldek or so...
                        echo ""
                fi
                # try to nicely show package list, to just copy&paste it to poldek or so...
-               cat $BRLISTFILE
+               eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE 2>$BRLISTFILE
                BRLIST=$(awk 'BEGIN{ORS=" ";} NR>1 {print $1;}' $BRLISTFILE)
                echo
                echo "To install packages type:"
                BRLIST=$(awk 'BEGIN{ORS=" ";} NR>1 {print $1;}' $BRLISTFILE)
                echo
                echo "To install packages type:"