From 078395474fcfb7d3b786494e26e8955afa8a7176 Mon Sep 17 00:00:00 2001 From: "chess.griffin" Date: Sat, 13 Sep 2008 14:26:03 +0000 Subject: [PATCH] add in fixes for aircrack-ng and pygame; remove unused check_slack_version function call in the rsync function; fix issue where PIDFILE would be left behind when sbopkg was used in cli; thanks to LukenShiro for these bug reports --- src/usr/bin/sbopkg | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/usr/bin/sbopkg b/src/usr/bin/sbopkg index cf0dd3f..4b72c44 100755 --- a/src/usr/bin/sbopkg +++ b/src/usr/bin/sbopkg @@ -29,8 +29,9 @@ # Other contributors: Bob Lounsbury, Robby Workman, Alan Hicks, Paul # Wisehart, slakmagik, Eric Hameleers, Michiel van Wessem, hba, Erik # Hanson, Antoine, ktabic, Ken Roberts, samac, Bert Babington, Murat -# D. Kadirov, The-spiki, and David Somero. This script would not be -# where it is without the help of these folks. Thank you! +# D. Kadirov, The-spiki, David Somero; and LukenShiro. This script +# would not be where it is without the help of these folks. Thank +# you! # Variables SCRIPT=${0##*/} @@ -312,7 +313,7 @@ potential updates..." >> $UPDATELIST # Ugly hack for several SlackBuilds that use $SRCVER # but not in the final package name, so we need to # blank out $NEWSRCVER - if [[ "$PRGNAM" == "ctorrent" || "$PRGNAM" == "argtable" || "$PRGNAM" == "libevent" || "$PRGNAM" == "graveman" || "$PRGNAM" == "hugin" || "$PRGNAM" == "lame" || "$PRGNAM" == "kchmviewer" ]]; then + if [[ "$PRGNAM" == "ctorrent" || "$PRGNAM" == "argtable" || "$PRGNAM" == "libevent" || "$PRGNAM" == "graveman" || "$PRGNAM" == "hugin" || "$PRGNAM" == "lame" || "$PRGNAM" == "kchmviewer" || "$PRGNAM" == "aircrack-ng" || "$PRGNAM" == "pygame" ]]; then NEWSRCVER="" fi CURPKG=$(echo $NAME-$VER-$ARCH-$BUILD) @@ -649,7 +650,6 @@ rm -rf $TMP/sbopkg_rsync.lck rsync_repo () { # This function does the rsync with SBo. -check_slack_version check_write $LOCALREPO/$SLACKVER/ if [ "$WRITE" = "false" ]; then if [ "$DIAG" = 1 ]; then @@ -1102,7 +1102,6 @@ to build packages." fi done rm -rf $SBOPKGOUTPUT - exit 0 cleanup exit 0 fi