From ed891ce4ae0492e68c2e7e04d6163f230d5c0cc1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Sun, 22 Aug 2010 08:51:31 +0000
Subject: [PATCH] - format -m message better - allow -n to equal -t

Changed files:
    relup.sh -> 1.25
---
 relup.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/relup.sh b/relup.sh
index f15ca45..dd943d8 100644
--- a/relup.sh
+++ b/relup.sh
@@ -17,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
+-t | -n
+  Test mode (dry-run). do not commit
 -m
   Specify commit message
 
@@ -56,7 +56,7 @@ if [ ! -x /usr/bin/getopt ]; then
 	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"
 
@@ -68,7 +68,7 @@ while true; do
 	-u)
 		update=1
 		;;
-	-t)
+	-t | -n)
 		test=1
 		;;
 	-m)
@@ -115,10 +115,14 @@ for spec in "$@"; do
 	echo "$spec" >> "$tmpd/$rel"
 done
 
+n="$(echo -e '\nn')"
+n="${n%%n}"
 for file in $(ls "$tmpd" 2>/dev/null); do
 	files=$(cat "$tmpd/$file")
 	rel=$(basename "$file")
-	msg="- release $rel${message:+ ($message)}"
+	msg=""
+	[ -n "$message" ] && msg="$msg- $message$n"
+	msg="$msg- release $rel$n"
 	echo cvs ci -m "'$msg'"
 	if [ "$test" != 1 ]; then
 		cvs ci -m "$msg" $files
-- 
2.43.0