commit a patch from Mauro that changes a variable name (BUILD) that was used to track the build package number as well as the set of packages were were building/installing from CLI; this latter instance now uses a different variable

This commit is contained in:
chess.griffin 2009-10-30 21:10:43 +00:00
parent bb0f5047e7
commit b6cfb9f55b

View file

@ -4246,6 +4246,7 @@ unset REPO_GPG # Active branch's GPG checking
unset CLEANUP # If set, delete the sources & c. after the build unset CLEANUP # If set, delete the sources & c. after the build
unset KEEPLOG # If set, keep a permanent build log unset KEEPLOG # If set, keep a permanent build log
unset ALLOW_MULTI # If set, allow more that one instance of sbopkg running unset ALLOW_MULTI # If set, allow more that one instance of sbopkg running
unset BUILDLIST # List of packages to build/install (from CLI)
unset BUILD BFLAG IFLAG CHK_UPDATES GENSEARCH CHANGELOG OBSOLETESRC GETPKGS unset BUILD BFLAG IFLAG CHK_UPDATES GENSEARCH CHANGELOG OBSOLETESRC GETPKGS
unset RSYNC SEARCH UPDATE VERSION CUSTOMVER SKIP_INSTALLED PREVIEW_READMES unset RSYNC SEARCH UPDATE VERSION CUSTOMVER SKIP_INSTALLED PREVIEW_READMES
@ -4288,7 +4289,7 @@ while getopts ":b:cd:e:f:g:hi:klopqrRs:uv:" OPT; do
b ) # Build b ) # Build
BFLAG=1 BFLAG=1
TYPE="build" TYPE="build"
BUILD="$OPTARG" BUILDLIST="$OPTARG"
unset DIAG unset DIAG
;; ;;
c ) # Check for updates to installed SBo packages c ) # Check for updates to installed SBo packages
@ -4312,7 +4313,7 @@ while getopts ":b:cd:e:f:g:hi:klopqrRs:uv:" OPT; do
i ) # Build and install i ) # Build and install
IFLAG=1 IFLAG=1
TYPE="buildinstall" TYPE="buildinstall"
BUILD="$OPTARG" BUILDLIST="$OPTARG"
unset DIAG unset DIAG
;; ;;
k ) # Skip installed packages k ) # Skip installed packages
@ -4469,14 +4470,14 @@ if [[ $DIAG ]]; then
main_menu main_menu
cleanup cleanup
else else
if [[ $BUILD ]]; then if [[ $BUILDLIST ]]; then
MISSING_LIST_FILE=$SBOPKGTMP/sbopkg_addall_missing MISSING_LIST_FILE=$SBOPKGTMP/sbopkg_addall_missing
MISSING_SINGLE_FILE=$SBOPKGTMP/sbopkg_add_item_missing MISSING_SINGLE_FILE=$SBOPKGTMP/sbopkg_add_item_missing
> $SBOPKGTMP/sbopkg-start-queue > $SBOPKGTMP/sbopkg-start-queue
> $SBOPKGTMP/sbopkg_user_queue.lck > $SBOPKGTMP/sbopkg_user_queue.lck
> $MISSING_LIST_FILE > $MISSING_LIST_FILE
> $MISSING_SINGLE_FILE > $MISSING_SINGLE_FILE
for PKGBUILD in $BUILD; do for PKGBUILD in $BUILDLIST; do
if [[ ${PKGBUILD:(-4)} == ".sqf" ]]; then if [[ ${PKGBUILD:(-4)} == ".sqf" ]]; then
parse_queue $QUEUEDIR/$PKGBUILD parse_queue $QUEUEDIR/$PKGBUILD
continue continue