made a couple of small aesthetic tweaks

Made sbopkg quit announcing its GPG checks twice and made it clear what
the build options line was in the summary output.
This commit is contained in:
slakmagik 2010-06-29 14:56:57 +00:00
parent 0bd695fa24
commit c7553e2101

View file

@ -3652,9 +3652,9 @@ check_asc() {
local CATEGORY=$(echo $CHKPKG | cut -d/ -f2) local CATEGORY=$(echo $CHKPKG | cut -d/ -f2)
local REPLY local REPLY
echo -n " Checking GPG for $GPGNAME.tar.gz ... " | tee -a $TMPLOG echo -n " Checking GPG for $GPGNAME.tar.gz ... " >> $TMPLOG
if ! gpg --verify $CHKPKG.*.asc > /dev/null 2>&1; then if ! gpg --verify $CHKPKG.*.asc > /dev/null 2>&1; then
echo "FAILED!" | tee -a $TMPLOG echo "GPG check FAILED!" | tee -a $TMPLOG
if [[ ! -e $CHKPKG.tar.gz && ! -e $CHKPKG.*.asc ]]; then if [[ ! -e $CHKPKG.tar.gz && ! -e $CHKPKG.*.asc ]]; then
echo " No tarball or .asc file found." | tee -a $TMPLOG echo " No tarball or .asc file found." | tee -a $TMPLOG
fi fi
@ -3691,7 +3691,7 @@ EOF
esac esac
done done
else else
echo "OK" | tee -a $TMPLOG echo "OK" >> $TMPLOG
fi fi
tar -C ./$CATEGORY -zxf $CHKPKG.tar.gz tar -C ./$CATEGORY -zxf $CHKPKG.tar.gz
return 0 return 0
@ -3721,8 +3721,6 @@ process_queue() {
echo " Build only" >> $TMPLOG echo " Build only" >> $TMPLOG
fi fi
echo >> $TMPLOG echo >> $TMPLOG
echo "Checking GPG signatures. Please be patient..."
echo
for CHKBUILD in $(< $STARTQUEUE); do for CHKBUILD in $(< $STARTQUEUE); do
unset PKG PKGPATH PKGNAME VERSION BUILD PICKFILE FILE unset PKG PKGPATH PKGNAME VERSION BUILD PICKFILE FILE
echo "$CHKBUILD:" >> $TMPLOG echo "$CHKBUILD:" >> $TMPLOG
@ -3765,7 +3763,7 @@ process_queue() {
return 0 return 0
fi fi
if [[ $BUILDOPTIONS ]]; then if [[ $BUILDOPTIONS ]]; then
echo " $BUILDOPTIONS" >> $TMPLOG echo " Build options: $BUILDOPTIONS" >> $TMPLOG
else else
echo " No build options selected." >> $TMPLOG echo " No build options selected." >> $TMPLOG
fi fi