sbopkg: Do not use wildcard.

As many package name now uses xx.yy format, it may failed
to detect the correct package name.

Thanks to Chris Abela.

Fix #19.

Signed-off-by: Willy Sudiarto Raharjo <willysr@sbopkg.org>
This commit is contained in:
Willy Sudiarto Raharjo 2016-08-30 06:11:29 +07:00
parent 4182d1a5c4
commit 27d215115d
No known key found for this signature in database
GPG Key ID: 887B8374D7333381
3 changed files with 8 additions and 3 deletions

View File

@ -86,3 +86,4 @@ We moved to github, so revision number no longer used
Philippe Delavalade Philippe Delavalade
pyllyukko pyllyukko
Dhaby Xiloj Dhaby Xiloj
Chris Abela

View File

@ -1415,7 +1415,7 @@ check_gpg() {
$GPGNAME tarball found.")" 8 40 $GPGNAME tarball found.")" 8 40
return 1 return 1
fi fi
if ! gpg --verify $CHKPKG.*.asc > /dev/null 2>&1; then if ! gpg --verify $CHKPKG.tar.gz.asc > /dev/null 2>&1; then
dialog --title "WARNING" --yesno "$(crunch "GPG CHECK FAILED!\n\n \ dialog --title "WARNING" --yesno "$(crunch "GPG CHECK FAILED!\n\n \
Would you like to delete the $GPGNAME directory and tarball \ Would you like to delete the $GPGNAME directory and tarball \
so you can perform a new sync? If so, all local changes to \ so you can perform a new sync? If so, all local changes to \
@ -3757,9 +3757,9 @@ check_asc() {
local REPLY local REPLY
echo -n " Checking GPG for $GPGNAME.tar.gz ... " >> $TMPLOG echo -n " Checking GPG for $GPGNAME.tar.gz ... " >> $TMPLOG
if ! gpg --verify $CHKPKG.*.asc > /dev/null 2>&1; then if ! gpg --verify $CHKPKG.tar.gz.asc > /dev/null 2>&1; then
echo "GPG check 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.tar.gz.asc ]]; then
echo " No tarball or .asc file found." | tee -a $TMPLOG echo " No tarball or .asc file found." | tee -a $TMPLOG
fi fi
while :; do while :; do

View File

@ -1,5 +1,9 @@
SBOPKG NEWS SBOPKG NEWS
sbopkg-dev (2016-08-30 23:14:21 UTC)
MODIFICATIONS
* Do not use wildcard for GPG checking (Fix #19)
sbopkg-0.38.0 (2016-07-01 16:52:27 UTC) sbopkg-0.38.0 (2016-07-01 16:52:27 UTC)
FEATURES FEATURES
* Add --no-group to rsync so files are owned by root:root * Add --no-group to rsync so files are owned by root:root