= rel 7

[packages/rpm-build-tools.git] / relup.sh

diff --git a/relup.sh b/relup.sh
index 76f735e9c5167b30af89684653d26520b0a60cb5..7557ba619b1282596364914aa6d253ba8159fbea 100755 (executable)
--- a/relup.sh
+++ b/relup.sh
@@ -17,13 +17,15 @@ get_dump() {
 }
 
 usage="Usage:
-${0##*/} [-i] [-u] [-t] [-n] [-m <MESSAGE>] <SPECLIST>
+${0##*/} [-i] [-g] [-u] [-t|-n] [-m <MESSAGE>] <SPECLIST>
 
 Options:
 -i
   Try to increment package release
+-g
+ get packages if missing, do nothing else
 -u
-  git pull first
+ update packages (git pull)
 -t | -n
   Test mode (dry-run). do not commit
 -m
@@ -75,6 +77,8 @@ bump_release() {
 package_name() {
        local specfile="${1%/}" package
 
+       # strip branch
+       specfile=${specfile%:*}
        # basename
        specfile=${specfile##*/}
        # strip .spec
@@ -83,12 +87,24 @@ package_name() {
        echo $package
 }
 
+get_branch() {
+       local specfile="${1%/}" branch
+
+       branch=${specfile#*:}
+
+       if [ "$branch" != "$specfile" ]; then
+               echo "$branch"
+       else
+               echo ""
+       fi
+}
+
 if [ ! -x /usr/bin/getopt ]; then
        echo >&1 "You need to install util-linux to use relup.sh"
        exit 1
 fi
 
-t=$(getopt -o 'm:inuth' -n "${0##*/}" -- "$@") || exit $?
+t=$(getopt -o 'm:inguth' -n "${0##*/}" -- "$@") || exit $?
 # Note the quotes around `$t': they are essential!
 eval set -- "$t"
 
@@ -100,6 +116,9 @@ while true; do
        -u)
                update=1
                ;;
+       -g)
+               get=1
+               ;;
        -t | -n)
                test=1
                ;;
@@ -123,24 +142,48 @@ while true; do
        shift
 done
 
-tmpd=$(mktemp -d "${TMPDIR:-/tmp}/relXXXXXX")
 topdir=$(rpm -E '%{_topdir}')
 
-# round 1: get packages and update .spec files
-# batches changes for each release
-# TODO: drop this, in git need to commit and push each package separately, no
-# way to group changes as in CVS
+n="$(echo -e '\nn')"
+n="${n%%n}"
+
 cd "$topdir"
 for pkg in "$@"; do
+       branch=$(get_branch "$pkg")
+       # pkg: package %{name}
        pkg=$(package_name "$pkg")
+
+       # spec: package/package.spec
        spec=$(rpm -D "name $pkg" -E '%{_specdir}/%{name}.spec')
        spec=${spec#$topdir/}
 
-       echo "$pkg ..."
+       # pkgdir: package/
+       pkgdir=${spec%/*}
+
+       # specname: only spec filename
+       specname=${spec##*/}
 
-       if [ "$update" = "1" ]; then
-               ./builder -g -ns "$spec"
+       # start real work
+       if [ -n "$branch" ]; then
+               echo "$pkg:$branch ..."
+       else
+               echo "$pkg ..."
        fi
+
+       # get package
+       [ "$get" = 1 -a -d "$pkgdir" ] && continue
+
+       if [ "$update" = "1" -o "$get" = "1" ]; then
+               if [ -n "$branch" ]; then
+                       ./builder -g -ns "$spec" -r $branch
+               else
+                       ./builder -g -ns "$spec"
+               fi
+       fi
+
+       [ "$get" = 1 ] && continue
+
+       # update .spec files
        rel=$(get_release "$spec")
        if [ "$inc" = 1 ]; then
                if [[ $rel = *%* ]]; then
@@ -155,27 +198,16 @@ for pkg in "$@"; do
                # refetch release
                rel=$(get_release "$spec")
        fi
-       echo "$spec" >> "$tmpd/$rel"
-done
 
-# round 2: commit the changes
-n="$(echo -e '\nn')"
-n="${n%%n}"
-for rel in $(ls "$tmpd" 2>/dev/null); do
-       packages=$(cat "$tmpd/$rel")
-       for pkg in $packages; do
-               pkgdir=${pkg%/*}
-               spec=${pkg##*/}
-               msg=""
-               [ -n "$message" ] && msg="$msg- $message$n"
-               msg="$msg- release ${rel%%%*} (by relup.sh)"
-               echo git commit -m "$msg" $spec
-               if [ "$test" != 1 ]; then
-                       cd $pkgdir
-                       git commit -m "$msg" $spec
-                       git push
-                       cd ..
-               fi
-       done
+       # commit the changes
+       msg=""
+       [ -n "$message" ] && msg="$msg- $message$n"
+       msg="$msg- release ${rel%%%*} (by relup.sh)"
+       echo git commit -m "$msg" $spec
+       if [ "$test" != 1 ]; then
+               cd $pkgdir
+               git commit -m "$msg" $specname
+               git push
+               cd ..
+       fi
 done
-rm -rf $tmpd