From 3d97a432cf098558eaecd5467ad7d90e82660bde Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marcin=20Krzy=C5=BCanowski?= Date: Mon, 5 Aug 2002 20:02:15 +0000 Subject: [PATCH] -U, --try-upgrade - check version, and try to upgrade package 4ba695fadf7201dec108e64dc243b832 ./builder Changed files: builder.sh -> 1.109 --- builder.sh | 50 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/builder.sh b/builder.sh index a5436b9..25f33c0 100644 --- a/builder.sh +++ b/builder.sh @@ -74,9 +74,9 @@ usage() if [ -n "$DEBUG" ]; then set -xv; fi echo "\ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build] - [-bb|--build-binary] [-bs|--build-source] [{-B|--branch} ] - [{-d|--cvsroot} ] [-g|--get] [-h|--help] - [{-l,--logtofile} ] [-m|--mr-proper] [-q|--quiet] + [-bb|--build-binary] [-bs|--build-source] [-U|--try-upgrade] + [{-B|--branch} ] [{-d|--cvsroot} ] [-g|--get] + [-h|--help] [{-l,--logtofile} ] [-m|--mr-proper] [-q|--quiet] [-r ] [{-T--tag ] [-Tvs|--tag-version-stable] [-Tvd|--tag-version-devel] [-Ts|--tag-stable] [-Td|--tag-devel] [-Tv|--tag-version] [-u|--no-urls] [-v|--verbose] [--opts ] @@ -131,6 +131,7 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build] -Tv, --tag-version - add cvs tag NAME-VERSION-RELESE for files, -v, --verbose - be verbose, + -U, --try-upgrade - check version, and try to upgrade package --define - define a macro " @@ -404,6 +405,38 @@ build_package() fi cd $SPECS_DIR + + if [ -n "$TRY_UPGRADE" ]; then + + TNOTIFY=`./pldnotify.awk $SPECFILE` + + TNEWVER=`echo $TNOTIFY | awk '{ match($4,/\[NEW\]/); print $5 }'` + + if [ -n $TNEWVER ]; then + + TOLDVER=`echo $TNOTIFY | awk '{ print $3; }'` + + echo "New version found, updating spec file to version " $TNEWVER + + cp -f $SPECFILE $SPECFILE.bak + + chmod +w $SPECFILE + + eval "perl -pi -e 's/Version:\t"$TOLDVER"/Version:\t"$TNEWVER"/gs' $SPECFILE" + eval "perl -pi -e 's/Release:\t[1-9]{0,4}/Release:\t1/' $SPECFILE" + + parse_spec; + + get_files "$SOURCES $PATCHES"; + + unset TOLDVER TNEWVER TNOTIFY + fi + + fi + + + cd $SPECS_DIR + case "$COMMAND" in build ) BUILD_SWITCH="-ba" ;; @@ -420,6 +453,15 @@ build_package() fi if [ "$?" -ne "0" ]; then + + if [ -n "$TRY_UPGRADE" ]; then + + echo "\n!!! Package with new version cannot be build automagically\n" + + mv -f $SPECFILE.bak $SPECFILE + + fi + Exit_error err_build_fail; fi unset BUILD_SWITCH @@ -517,6 +559,8 @@ while test $# -gt 0 ; do shift;; -v | --verbose ) BE_VERBOSE="1"; shift ;; + -U | --try-upgrade) + TRY_UPGRADE="1"; shift ;; --define) shift MACRO="${1}" -- 2.44.0