abump: tweak upgrade/cvelist

abump.in

@@ -18,7 +18,8 @@ fi
 
 # version bump packages
 do_bump() {
-	local p rc=0 pkgname pkgver section upgrade cve message
+	local p rc=0 pkgname pkgver section message
+	local upgrade="${cvelist:+security }upgrade"
 	for p; do
 		pkgname=${p%-[0-9]*}
 		pkgver=${p#${pkgname}-}
@@ -27,14 +28,10 @@ do_bump() {
 		set -e
 
 		cd $HOME/aports/*/$pkgname
-		section=${PWD%/*} upgrade="upgrade" cve=
+		section=${PWD%/*}
 		section=${section##*/}
-		if [ -n "$cvelist" ]; then
-			upgrade="security upgrade"
-			cve=" ($cvelist)"
-		fi
 
-		message="$section/$pkgname: $upgrade to ${pkgver}${cve}"
+		message="$section/$pkgname: $upgrade to ${pkgver}${cvelist}"
 		if [ -n "$fixes" ]; then
 			message="$message
 
@@ -86,7 +83,7 @@ fi
 eval set -- "$args"
 while true; do
 	case $1 in
-		-s|--security) cvelist="$2"; shift;;
+		-s|--security) cvelist=" ($2)"; shift;;
 		-f|--fixes) fixes="$2"; shift;;
 		-R|--recursive) recursive="-R";;
 		-k|--keep) keep="-k";;