mirrors/sbopkg
2
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-11-10 03:50:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

revise build queue explanatory text; change references to 'build queue'; remove some cruft from sbopkg; revise sbopkg(8) man page re: build queue; revise README re: build queue; remove 'no updates' from debug list unless an internal 'FULL DEBUG' variable is set

Browse Source
This commit is contained in:
chess.griffin 2008-12-22 14:35:51 +00:00
parent 51277783f5
commit 6f0dd4ea29
3 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/usr/bin/sbopkg
View File

@ -44,6 +44,7 @@ SBOPKG_CONF="${SBOPKG_CONF:-/etc/sbopkg/sbopkg.conf}"
CWD="$(pwd)" CWD="$(pwd)"
SBOVER=SVN SBOVER=SVN
UPDATE_DEBUG="1" # This will be uncommented in SVN and RC releases UPDATE_DEBUG="1" # This will be uncommented in SVN and RC releases
#FULL_DEBUG="1" # This will be commented except for my testing
config_check () { config_check () {
# Check if config file is there and if so check that it has all # Check if config file is there and if so check that it has all
@ -384,7 +385,7 @@ potential updates..." >> $UPDATELIST
fi fi
#elif [[ $VERSION$NEWSRCVER = $VER && $NEWBUILD = $BUILD ]]; then #elif [[ $VERSION$NEWSRCVER = $VER && $NEWBUILD = $BUILD ]]; then
elif [[ $TESTVERSION$TESTNEWSRCVER = $TESTVER && $NEWBUILD = $BUILD ]]; then elif [[ $TESTVERSION$TESTNEWSRCVER = $TESTVER && $NEWBUILD = $BUILD ]]; then
if [ "$UPDATE_DEBUG" = 1 ]; then if [[ "$UPDATE_DEBUG" = 1 && "$FULL_DEBUG" = 1 ]]; then
echo $NAME: >> $UPDATELIST echo $NAME: >> $UPDATELIST
echo " No update." >> $UPDATELIST echo " No update." >> $UPDATELIST
echo " Debug: " $VERSION$NEWSRCVER-$NEWARCH-$NEWBUILD >> $UPDATELIST echo " Debug: " $VERSION$NEWSRCVER-$NEWARCH-$NEWBUILD >> $UPDATELIST
@ -586,7 +587,7 @@ elif [ $CHOICE = 0 ]; then
if [ "$U" = "Queue" ]; then if [ "$U" = "Queue" ]; then
echo "$APP $RVERSION-$RBUILD ON" >> $TMP/sbopkg-tmp-queue echo "$APP $RVERSION-$RBUILD ON" >> $TMP/sbopkg-tmp-queue
dialog --title "Done" --msgbox "$APP has been added to the \ dialog --title "Done" --msgbox "$APP has been added to the \
build/install queue." 8 30 build queue." 8 30
fi fi
if [ "$U" = "Build" ]; then if [ "$U" = "Build" ]; then
echo "$APP" > $TMP/sbopkg-start-queue echo "$APP" > $TMP/sbopkg-start-queue
@ -737,18 +738,21 @@ fi
} }
view_queue () { view_queue () {
# This function displays the contents of the build/install queue. # This function displays the contents of the build queue.
TMPQUEUE=$TMP/sbopkg-tmp-queue TMPQUEUE=$TMP/sbopkg-tmp-queue
WORKINGQUEUE=$TMP/sbopkg-working-queue WORKINGQUEUE=$TMP/sbopkg-working-queue
if [ ! -e $TMPQUEUE ]; then if [ ! -e $TMPQUEUE ]; then
dialog --title "Empty Queue" --msgbox "The build/install \ dialog --title "Empty Queue" --msgbox "The build \
queue is empty." 8 30 queue is empty." 8 30
continue continue
else else
dialog --title "Viewing Build Queue" --separate-output \ dialog --title "Viewing Build Queue" --separate-output \
--checklist "Please select or unselect those packages \ --checklist "The following packages are currently in the \
you wish to keep in the queue and then <Ok> to continue \ build queue. Please note that when the build queue is processed, \
or press <Cancel> to exit." 18 40 8 \ the packages selected below will be built, and optionally installed, \
in the order listed from top to bottom.\n\nPlease select or unselect \
those packages you wish to keep in the build queue and then press \
<Ok> to continue or press <Cancel> to exit." 30 50 8 \
--file $TMPQUEUE 2>$TMP/sbopkg-ans-queue --file $TMPQUEUE 2>$TMP/sbopkg-ans-queue
if [ $? = 1 ]; then if [ $? = 1 ]; then
rm -rf $TMP/sbopkg-ans-queue rm -rf $TMP/sbopkg-ans-queue
@ -766,7 +770,6 @@ or press <Cancel> to exit." 18 40 8 \
if [ "$BUILDPKGS" = 1 ]; then if [ "$BUILDPKGS" = 1 ]; then
mv $TMP/sbopkg-ans-queue $TMP/sbopkg-start-queue mv $TMP/sbopkg-ans-queue $TMP/sbopkg-start-queue
fi fi
#rm -rf $TMP/sbopkg-ans-queue
fi fi
fi fi
fi fi
@ -1383,11 +1386,11 @@ if [ "$DIAG" = 1 ]; then
fi fi
if [ -e $TMP/sbopkg-tmp-queue ]; then if [ -e $TMP/sbopkg-tmp-queue ]; then
dialog --title "Delete Queue?" --yes-label "Keep" --no-label \ dialog --title "Delete Queue?" --yes-label "Keep" --no-label \
"Delete" --yesno "Would you like to keep the queue or would \ "Delete" --yesno "Would you like to keep the build queue or \
you like to delete it?" 6 40 would you like to delete it?" 6 40
if [ $? = 1 ]; then if [ $? = 1 ]; then
rm -rf $TMP/sbopkg-tmp-queue rm -rf $TMP/sbopkg-tmp-queue
dialog --title "Done" --msgbox "The queue has been \ dialog --title "Done" --msgbox "The build queue has been \
deleted." 8 35 deleted." 8 35
fi fi
fi fi
@ -1463,8 +1466,8 @@ dialog --default-item "$R" --title "SlackBuilds.org Package Browser \
"Browse" "Browse the local SlackBuilds.org repo" \ "Browse" "Browse the local SlackBuilds.org repo" \
"Search" "Search the local SlackBuilds.org repo" \ "Search" "Search the local SlackBuilds.org repo" \
"Cache" "View the contents of the cache directory" \ "Cache" "View the contents of the cache directory" \
"View" "View the build/install queue" \ "View" "View the build queue" \
"Queue" "Process the build/install queue" \ "Queue" "Process the build queue" \
"Log" "View the permanent build log" \ "Log" "View the permanent build log" \
"Version" "Select Slackware version (currently: $SLACKVER)" \ "Version" "Select Slackware version (currently: $SLACKVER)" \
"Readme" "View the sbopkg README" \ "Readme" "View the sbopkg README" \
@ -1521,7 +1524,6 @@ fi
if [ "$R" = "Queue" ]; then if [ "$R" = "Queue" ]; then
BUILDPKGS=1 BUILDPKGS=1
#cp $TMP/sbopkg-tmp-queue $TMP/sbopkg-build-queue
process_queue process_queue
fi fi

11
src/usr/doc/README
View File

@ -17,11 +17,12 @@ README, SlackBuild, .info, and slack-desc files for each package, and
make manual edits to a copy of the original .info or SlackBuild files. make manual edits to a copy of the original .info or SlackBuild files.
Sbopkg will also allow the user to select packages to build and it Sbopkg will also allow the user to select packages to build and it
will download the source code, check the md5sum, build a Slackware will download the source code, check the md5sum, build a Slackware
package, and, if using the dialog interface, install the package. It package, and, optionally install the package. The user can also
will not check dependencies since that is not a feature native to build, and optionally install, more than one package by using the
Slackware. Sbopkg is one thing and one thing only: a medium to easily 'build queue' feature. Sbopkg will not check dependencies since that
browse a local copy of the SlackBuilds.org repository and build is not a feature native to Slackware. Sbopkg is one thing and one
packages from it. thing only: a medium to easily browse a local copy of the
SlackBuilds.org repository and build packages from it.
Sbopkg can be also be used strictly from the command line without the Sbopkg can be also be used strictly from the command line without the
dialog interface to do most of the above items. Typing sbopkg -h dialog interface to do most of the above items. Typing sbopkg -h

10
src/usr/man/man8/sbopkg.8
View File

@ -41,11 +41,11 @@ and if sbopkg finds a built package for a particular piece of software
in the OUTPUT directory, then sbopkg will automatically add a new menu in the OUTPUT directory, then sbopkg will automatically add a new menu
entry allowing the user to install the package if he so choosed. entry allowing the user to install the package if he so choosed.
Alternatively, if sbopkg is run from the command line, the user can Alternatively, if sbopkg is run from the command line, the user can
choose to build or build and install packages automatically. There choose to build or build and install packages automatically. There is
is also an ability to add packages to a 'bulk build queue' for also an ability to add packages to a 'build queue' for batch
batch processing in the order listed in the queue. Finally, if processing in the order listed in the queue. Finally, if KEEPLOG is
KEEPLOG is set to YES in the sbopkg.conf file then a permanent log set to YES in the sbopkg.conf file then a permanent log of the build
of the build process is saved in /tmp/sbopkg-build-log. process is saved in /tmp/sbopkg-build-log.
Alternatively, sbopkg can be run from the command line without using Alternatively, sbopkg can be run from the command line without using
the dialog interface. Executing "sbopkg -h" will display a list of the dialog interface. Executing "sbopkg -h" will display a list of