comment some code logic

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

diff --git a/relup.sh b/relup.sh
old mode 100644 (file)
new mode 100755 (executable)
index aca0d57..5c308ba
--- a/relup.sh
+++ b/relup.sh
@@ -1,11 +1,8 @@
 #!/bin/sh
-# script to run after "rel up" style change.
+# script to run after "release bump" style change.
 # takes Release from spec and creates commit with message
 # groups similiar commits together.
-# "- rel $rel"
-# - fails when specfile defines Icon: but the icon is not present in SOURCES
-# TODO
-# - optional message after rel: "- rel 9 (rebuild with foolib)"
+# "- release $rel"
 
 set -e
 
@@ -19,9 +16,24 @@ get_dump() {
        echo "$out"
 }
 
+usage="Usage:
+${0##*/} [-i] [-u] [-t] [-n] [-m <MESSAGE>] <SPECLIST>
+
+Options:
+-i
+  Try to increment package release
+-u
+  git pull first
+-t | -n
+  Test mode (dry-run). do not commit
+-m
+  Specify commit message
+
+"
+
 get_release() {
        local specfile="$1"
-       rel=$(awk '/^%define[   ]*_rel[         ]/{print $NF}' $specfile)
+       rel=$(awk '/^%define[   ]+_?rel[        ]+/{print $NF}' $specfile)
        if [ -z "$rel" ]; then
                dump=$(get_dump "$specfile")
                rel=$(echo "$dump" | awk '/PACKAGE_RELEASE/{print $NF; exit}')
@@ -29,20 +41,43 @@ get_release() {
        echo $rel
 }
 
+set_release() {
+       local specfile="$1"
+       local rel="$2"
+       local newrel="$3"
+       sed -i -e "
+               s/^\(%define[ \t]\+_\?rel[ \t]\+\)$rel\$/\1$newrel/
+               s/^\(Release:[ \t]\+\)$rel\$/\1$newrel/
+       " $specfile
+}
+
 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:' -n $(dirname "$0") -- "$@"` || exit $?
-# Note the quotes around `$TEMP': they are essential!
+t=$(getopt -o 'm:inuth' -n "${0##*/}" -- "$@") || exit $?
+# Note the quotes around `$t': they are essential!
 eval set -- "$t"
 
 while true; do
        case "$1" in
+       -i)
+               inc=1
+               ;;
+       -u)
+               update=1
+               ;;
+       -t | -n)
+               test=1
+               ;;
        -m)
                shift
-               message="$1"
+               message="${1#- }"
+               ;;
+       -h)
+               echo "$usage"
+               exit 0
                ;;
        --)
                shift
@@ -57,17 +92,56 @@ while true; do
 done
 
 tmpd=$(mktemp -d "${TMPDIR:-/tmp}/relXXXXXX")
-for spec in "$@"; do
-       spec=${spec%.spec}.spec
+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
+cd "$topdir"
+for pkg in "$@"; do
+       name=${pkg%.spec} name=${name##*/}
+       spec=$(rpm -D "name $name" -E '%{_specdir}/%{name}.spec')
+       spec=${spec#$topdir/}
+       if [ "$update" = "1" ]; then
+               ./builder -g -ns "$spec"
+       fi
        rel=$(get_release "$spec")
+       if [ "$inc" = 1 ]; then
+               if [[ $rel = *%* ]]; then
+                       relmacro=${rel#*%}
+                       relnum=${rel%%%*}
+                       newrel=$(expr ${relnum} + 1)
+                       set_release "$spec" $rel "${newrel}%${relmacro}"
+               else
+                       newrel=$(expr ${rel} + 1)
+                       set_release "$spec" $rel $newrel
+               fi
+
+               # refetch release
+               rel=$(get_release "$spec")
+       fi
        echo "$spec" >> "$tmpd/$rel"
 done
 
-for file in $(ls "$tmpd" 2>/dev/null); do
-       files=$(cat "$tmpd/$file")
-       rel=$(basename "$file")
-       msg="- rel $rel${message:+ ($message)}"
-       echo cvs ci -m "'$msg'"
-       cvs ci -m "$msg" $files
+# 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
 done
 rm -rf $tmpd