diff -r 417b32da90bf -r 46658e3fc781 scripts/patch-renumber.sh
--- a/scripts/patch-renumber.sh	Thu Jan 29 19:00:08 2009 +0000
+++ b/scripts/patch-renumber.sh	Mon May 25 17:26:21 2009 +0000
@@ -23,14 +23,19 @@
 cpt="${2}"
 inc="${3}"
 
-case $(LC_ALL=C svnversion 2>/dev/null) in
+case "$(LC_ALL=C svnversion "${dir}" 2>/dev/null)" in
     exported)   CMD="mv -v";;
     *)          CMD="svn mv";;
 esac
 
 for p in "${dir}"/*.patch; do
     [ -e "${p}" ] || { echo "No such file '${p}'"; exit 1; }
-    newname="$(printf "%03d" ${cpt})-$(basename "${p}" |"${sed}" -r -e 's/^[[:digit:]]{3}-//')"
+    newname="$(printf "%03d-%s"                                 \
+                      "${cpt}"                                  \
+                      "$(basename "${p}"                        \
+                        |"${sed}" -r -e 's/^[[:digit:]]+[-_]//' \
+                       )"                                       \
+              )"
     [ "${p}" = "${dir}/${newname}" ] || ${CMD} "${p}" "${dir}/${newname}"
     cpt=$((cpt+inc))
 done