From c4310a4c6f5984c24dceb8ad4f05f6ac6235c006 Mon Sep 17 00:00:00 2001 From: "mauro.giachero" Date: Mon, 20 Jul 2009 13:56:29 +0000 Subject: [PATCH] Cleanup and fix process_queue() post-build code. Signed-off-by: Mauro Giachero --- src/usr/sbin/sbopkg | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/usr/sbin/sbopkg b/src/usr/sbin/sbopkg index 2cf7e13..d3eecac 100755 --- a/src/usr/sbin/sbopkg +++ b/src/usr/sbin/sbopkg @@ -3470,16 +3470,12 @@ process_queue() { NEWPACKAGE=$(ls -1t *.t?z | head -n1) echo " Building package $NEWPACKAGE ... OK" >> $TMPSUMMARYLOG echo "Built package: $NEWPACKAGE" - if [[ $QUEUETYPE == "buildinstall" ]]; then - if [[ $SB_OUTPUT/*.t?z ]]; then - cd $SB_OUTPUT - NEWPACKAGE=$(ls -1t *.t?z | head -n1) + if [[ -f $NEWPACKAGE ]]; then + if [[ $QUEUETYPE == "buildinstall" ]]; then install_package $SB_OUTPUT $NEWPACKAGE echo " Installing package $NEWPACKAGE ... OK" >> $TMPSUMMARYLOG fi - fi - if [[ $SB_OUTPUT/*.t?z ]]; then - mv $SB_OUTPUT/*.t?z $OUTPUT/ + mv $NEWPACKAGE $OUTPUT fi else echo >> $TMPSUMMARYLOG