- rel may contain other macros, strip and readd them for increment

Changed files:
    relup.sh -> 1.23

diff --git a/relup.sh b/relup.sh
index 67423d8cd9a3d37b5f9879e257a5a0b7997a5e69..e7d90063f1e62576fd7b30b7bde86486be0031fb 100644 (file)
--- a/relup.sh
+++ b/relup.sh
@@ -102,8 +102,15 @@ for spec in "$@"; do
        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")