From 7fc16eff80dc041ce00349b150352cf51607c453 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 1 Feb 2009 23:15:59 +0000 Subject: Fix patch-renumber: - look at the patch directory when using svnversion, not at current directory - some code beautification. /trunk/scripts/patch-renumber.sh | 9 7 2 0 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/patch-renumber.sh b/scripts/patch-renumber.sh index 6837043..f670b90 100755 --- a/scripts/patch-renumber.sh +++ b/scripts/patch-renumber.sh @@ -23,14 +23,19 @@ dir="${1}" 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 -- cgit v0.10.2-6-g49f6