fix issue where on rare occasions the built package name was not correctly identified; thanks to necropresto for the bug report (closes Issue 7 on Google Issue Tracker); minor cleanups to various files.

src/usr/bin/sbopkg

@@ -30,9 +30,9 @@
 #  Wisehart, slakmagik, Eric Hameleers, Michiel van Wessem, hba, Erik
 #  Hanson, Antoine, ktabic, Ken Roberts, samac, Bert Babington, Murat
 #  D. Kadirov, The-spiki, David Somero, LukenShiro, Drew Ames, nille,
-#  acidchild, mancha, macavity, Zordrak, Joao Felipe Santos, and
-#  cotterochan.  This script would not be where it is without the help
-#  of these folks.  Thank you!
+#  acidchild, mancha, macavity, Zordrak, Joao Felipe Santos,
+#  cotterochan, and necropresto.  This script would not be where it is
+#  without the help of these folks.  Thank you!
 #set -x
 
 # Variables
@@ -491,10 +491,13 @@ info_item () {
 # This function shows the menu for each package where the user can see
 # certain information or build the package if he is root.
 APP="$(cat $TMP/sbopkg_item_selection)"
+CATEGORY="$(cat $TMP/sbopkg_category_selection)"
+RVERSION=$(grep VERSION $LOCALREPO/$SLACKVER/$CATEGORY/$APP/$APP.info | cut -d= -f2 | sed s/\"//g)
+RBUILD=$(egrep -m1 "^BUILD" $LOCALREPO/$SLACKVER/$CATEGORY/$APP/$APP.SlackBuild | sed -e 's/^.*[=-]//;s/\"//;s/[ #}\t].*$//g;s/\"//g')
 U="README"
 while [ 0 ]; do
 PKGOUTPUT=${OUTPUT:-/tmp}
-if $(echo $(ls -lt $PKGOUTPUT) | grep -q "$APP"); then
+if $(echo $(ls -lt $PKGOUTPUT) | grep -E -q "$APP.*$RVERSION"); then
     IPACKAGE="$(basename $(ls -1t $PKGOUTPUT/${APP}*tgz | head -n 1))"
 else
     IPACKAGE=""
@@ -510,9 +513,6 @@ if [ "$KPACKAGE" = "" ]; then
 else
     LPACKAGE="$APP (Installed: $KPACKAGE)"
 fi
-CATEGORY="$(cat $TMP/sbopkg_category_selection)"
-RVERSION=$(grep VERSION $LOCALREPO/$SLACKVER/$CATEGORY/$APP/$APP.info | cut -d= -f2 | sed s/\"//g)
-RBUILD=$(egrep -m1 "^BUILD" $LOCALREPO/$SLACKVER/$CATEGORY/$APP/$APP.SlackBuild | sed -e 's/^.*[=-]//;s/\"//;s/[ #}\t].*$//g;s/\"//g')
 dialog --default-item "$U" --title "$APP ($RVERSION-$RBUILD)" \
 --backtitle "$LPACKAGE" --extra-button --extra-label "Back" --cancel-label \
 "Main Menu" --menu \
@@ -1250,6 +1250,7 @@ if [ $WRITE = "false" ]; then
     exit 0
 else
     rm -rf $TMP/sbopkg_*
+    rm -rf $TMP/sbopkgpidlist
     rm -f $PIDFILE
 fi
 cd $CWD
@@ -1273,8 +1274,6 @@ if [ -e $TMP/sbopkgpidlist ]; then
         echo "killing $pid"
         kill -9 $pid;
     done;
-    rm -rf $TMP/oldbuildpid
-    mv $TMP/sbopkgpidlist $TMP/oldbuildpid
     rm -rf $TMP/sbopkgpidlist
 fi
 if [ "$DIAG" = 1 ]; then

src/usr/doc/README

@@ -43,7 +43,7 @@ CONTRIBUTORS
 
 I welcome bug reports, suggestions, patches, or feature requests.
 Please post any of these to the Issue tracker (kind of like a
-Bugzilla) on the project's home page (click the Issues tab) at
+Bugzilla) on the project's Google page (click the Issues tab) at
 http://code.google.com/p/sbopkg so I can keep track of them.  There
 have been many contributors so far, and they are all mentioned near
 the top of the sbopkg script itself.  Thanks to everyone who has

src/usr/man/man5/sbopkg.conf.5

@@ -1,4 +1,4 @@
-.TH SBOPKG.CONF 5 "October 2008" sbopkg-SVN ""
+.TH SBOPKG.CONF 5 "December 2008" sbopkg-SVN ""
 .SH NAME
 .B sbopkg.conf
 \- Configuration file for sbopkg
@@ -20,7 +20,7 @@ The different configuration options are:
 This option allows the user to set the rsync mirror of the SBo
 repository that will be used by sbopkg.
 
-The default value of RSYNCMIRROR is slackbuilds.org::slackbuilds.
+The default value of RSYNCMIRROR is: slackbuilds.org::slackbuilds.
 
 .TP 5
 .B SLACKVER
@@ -28,7 +28,7 @@ The default value of RSYNCMIRROR is slackbuilds.org::slackbuilds.
 This option allows the user to set the default Slackware version in
 order to rsync with the matching SBo repository.
 
-The default value of SLACKVER is 12.1.
+The default value of SLACKVER is: 12.1.
 
 .TP 5
 .B LOCALREPO
@@ -36,7 +36,8 @@ The default value of SLACKVER is 12.1.
 This option allows the user to set the location of the local rsync
 mirror of the SBo repository.
 
-The default value of LOCALREPO is /home/sbo.
+The default value of LOCALREPO is:
+export LOCALREPO=${LOCALREPO:-/home/sbo}.
 
 .TP 5
 .B SRCDIR
@@ -44,15 +45,17 @@ The default value of LOCALREPO is /home/sbo.
 This option contains the location of the cache directory where
 source downloads will be saved.
 
-The default value of SRCDIR is /var/cache/sbopkg.
+The default value of SRCDIR is:
+export SRCDIR=${SRCDIR:-/var/cache/sbopkg}.
 
 .TP 5
 .B TMP
 .br
 This options sets the default directory where certain working
-files are saved on a temporary basis.
+files are saved on a temporary basis.  TMP must be exported as it is
+also used by the SBo SlackBuilds.
 
-The default value of TMP is /tmp/SBo.
+The default value of TMP is: export TMP=${TMP:-/tmp/SBo}.
 
 .TP 5
 .B KEEPLOG
@@ -63,7 +66,7 @@ with sbopkg in order to go back and review the build, and any errors,
 after exiting sbopkg.  If set to YES, this permanent log is saved at
 $TMP/sbopkg-build-log.
 
-The default value of KEEPLOG is YES.
+The default value of KEEPLOG is: YES.
 
 .TP 5
 .B TERMBUILD
@@ -74,7 +77,7 @@ instead of the dialog interface.  The advantage of doing so allows
 the user to use Ctrl-S to pause the output, Ctrl-Q to resume the
 output, and to page up and down to view the final output.
 
-The default value of TERMBUILD is NO.
+The default value of TERMBUILD is: NO.
 
 .TP 5
 .B RSYNCFLAGS
@@ -87,7 +90,7 @@ Note:  the rsync command in sbopkg already uses the --archive,
 --delete, and --exclude flags, so there is no need to add them to the
 RSYNCFLAGS option.  Changing these default options is not recommended.
 
-The default value of RSYNCFLAGS is "--timeout=10 --verbose".
+The default value of RSYNCFLAGS is: "--timeout=10 --verbose".
 
 .TP 5
 .B WGETFLAGS
@@ -100,7 +103,7 @@ not work.  Note:  the wget command in sbopkg already uses the -O flag,
 so there is no need to add that to the WGETFLAGS option.  Changing
 these default options is not recommended.
 
-The default value of WGETFLAGS is "--continue --progress-bar
+The default value of WGETFLAGS is: "--continue --progress-bar
 --timeout=10 --tries=5".
 
 .SH FILES

src/usr/man/man8/sbopkg.8

@@ -1,4 +1,4 @@
-.TH SBOPKG 8 "August 2008" sbopkg-SVN ""
+.TH SBOPKG 8 "December 2008" sbopkg-SVN ""
 .SH NAME
 .B sbopkg
 \ - The SlackBuilds.org Package Browser