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

This commit is contained in:
chess.griffin 2008-09-13 14:26:03 +00:00
parent 54533064a3
commit 078395474f

View File

@ -29,8 +29,9 @@
# Other contributors: Bob Lounsbury, Robby Workman, Alan Hicks, Paul # Other contributors: Bob Lounsbury, Robby Workman, Alan Hicks, Paul
# Wisehart, slakmagik, Eric Hameleers, Michiel van Wessem, hba, Erik # Wisehart, slakmagik, Eric Hameleers, Michiel van Wessem, hba, Erik
# Hanson, Antoine, ktabic, Ken Roberts, samac, Bert Babington, Murat # Hanson, Antoine, ktabic, Ken Roberts, samac, Bert Babington, Murat
# D. Kadirov, The-spiki, and David Somero. This script would not be # D. Kadirov, The-spiki, David Somero; and LukenShiro. This script
# where it is without the help of these folks. Thank you! # would not be where it is without the help of these folks. Thank
# you!
# Variables # Variables
SCRIPT=${0##*/} SCRIPT=${0##*/}
@ -312,7 +313,7 @@ potential updates..." >> $UPDATELIST
# Ugly hack for several SlackBuilds that use $SRCVER # Ugly hack for several SlackBuilds that use $SRCVER
# but not in the final package name, so we need to # but not in the final package name, so we need to
# blank out $NEWSRCVER # 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="" NEWSRCVER=""
fi fi
CURPKG=$(echo $NAME-$VER-$ARCH-$BUILD) CURPKG=$(echo $NAME-$VER-$ARCH-$BUILD)
@ -649,7 +650,6 @@ rm -rf $TMP/sbopkg_rsync.lck
rsync_repo () { rsync_repo () {
# This function does the rsync with SBo. # This function does the rsync with SBo.
check_slack_version
check_write $LOCALREPO/$SLACKVER/ check_write $LOCALREPO/$SLACKVER/
if [ "$WRITE" = "false" ]; then if [ "$WRITE" = "false" ]; then
if [ "$DIAG" = 1 ]; then if [ "$DIAG" = 1 ]; then
@ -1102,7 +1102,6 @@ to build packages."
fi fi
done done
rm -rf $SBOPKGOUTPUT rm -rf $SBOPKGOUTPUT
exit 0
cleanup cleanup
exit 0 exit 0
fi fi