normalize spec name, like builder script does

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

diff --git a/relup.sh b/relup.sh
old mode 100644 (file)
new mode 100755 (executable)
index 925c3d6..9e2e80e
--- 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
 
@@ -20,15 +17,15 @@ get_dump() {
 }
 
 usage="Usage:
-${0##*/} [-i] [-u] [-t] [-m <MESSAGE>] <SPECLIST>
+${0##*/} [-i] [-u] [-t] [-n] [-m <MESSAGE>] <SPECLIST>
 
 Options:
 -i
   Try to increment package release
 -u
-  cvs update first
--t
-  Test mode. do not commit
+  git pull first
+-t | -n
+  Test mode (dry-run). do not commit
 -m
   Specify commit message
 
@@ -54,12 +51,37 @@ set_release() {
        " $specfile
 }
 
+# normalize spec
+# takes as input:
+# - PACKAGE/
+# - ./PACKAGE/
+# - PACKAGE
+# - PACKAGE.spec
+# - ./PACKAGE.spec
+# - PACKAGE/PACKAGE
+# - PACKAGE/PACKAGE.spec
+# - ./PACKAGE/PACKAGE.spec
+# - rpm/PACKAGE/PACKAGE
+# - rpm/PACKAGE/PACKAGE.spec
+# - ./rpm/PACKAGE/PACKAGE.spec
+# returns PACKAGE
+package_name() {
+       local specfile="${1%/}" package
+
+       # basename
+       specfile=${specfile##*/}
+       # strip .spec
+       package=${specfile%.spec}
+
+       echo $package
+}
+
 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:iuth' -n "${0##*/}" -- "$@") || exit $?
+t=$(getopt -o 'm:inuth' -n "${0##*/}" -- "$@") || exit $?
 # Note the quotes around `$t': they are essential!
 eval set -- "$t"
 
@@ -71,7 +93,7 @@ while true; do
        -u)
                update=1
                ;;
-       -t)
+       -t | -n)
                test=1
                ;;
        -m)
@@ -95,15 +117,32 @@ while true; do
 done
 
 tmpd=$(mktemp -d "${TMPDIR:-/tmp}/relXXXXXX")
-for spec in "$@"; do
-       spec=${spec%.spec}.spec
-       rel=$(get_release "$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
+       pkg=$(package_name "$pkg")
+       spec=$(rpm -D "name $pkg" -E '%{_specdir}/%{name}.spec')
+       spec=${spec#$topdir/}
+
        if [ "$update" = "1" ]; then
-               cvs up "$spec"
+               ./builder -g -ns "$spec"
        fi
+       rel=$(get_release "$spec")
        if [ "$inc" = 1 ]; then
-               newrel=$(expr $rel + 1)
-               set_release "$spec" $rel $newrel
+               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")
@@ -111,13 +150,24 @@ for spec in "$@"; do
        echo "$spec" >> "$tmpd/$rel"
 done
 
-for file in $(ls "$tmpd" 2>/dev/null); do
-       files=$(cat "$tmpd/$file")
-       rel=$(basename "$file")
-       msg="- release $rel${message:+ ($message)}"
-       echo cvs ci -m "'$msg'"
-       if [ "$test" != 1 ]; then
-               cvs ci -m "$msg" $files
-       fi
+# 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