From 33374cac3944ce21b21fba4bb14ebf15e24c0b94 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 10 Nov 2009 19:32:11 +0100
Subject: scripts: output renumbered patches in a new directory

When renumbering patches, the original patches get removed and replaced
with the new ones. This can be annoying to loose the original patches.
Fix this by putting the new patchs in a directory of their own.
---
 scripts/patch-renumber.sh | 56 ++++++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 23 deletions(-)

(limited to 'scripts/patch-renumber.sh')

diff --git a/scripts/patch-renumber.sh b/scripts/patch-renumber.sh
index 95bae8fb..08ec1beb 100755
--- a/scripts/patch-renumber.sh
+++ b/scripts/patch-renumber.sh
@@ -9,37 +9,47 @@ myname="$0"
 
 doUsage() {
   cat <<_EOF_
-Usage: ${myname} <dir> <base> <inc> [sed_re]
-    Will renumber all patches found in 'dir', starting at 'base', and with
-    an increment of 'inc'.
+Usage: ${myname} <src_dir> <dst_dir> <base> <inc> [sed_re]
+    Renumbers all patches found in 'src_dir', starting at 'base', with an
+    increment of 'inc', and puts the renumbered patches in 'dst_dir'.
+    Leading digits are replaced with the new indexes, and a subsequent '_'
+    is replaced with a '-'.
     If 'sed_re' is given, it is interpreted as a valid sed expression, and
-    it will be applied to the patch name.
-    If the environment variable FAKE is set to 'y', then the command will
-    only be printed, and not executed (so you can check beforehand).
+    is be applied to the patch name.
+    If the environment variable FAKE is set to 'y', then nothing gets done,
+    the command to run is only be printed, and not executed (so you can
+    check beforehand).
+    'dst_dir' must not yet exist.
     Eg.:
-      patch-renumber.sh patches/gcc/4.3.1 100 10
-      patch-renumber.sh patches/gcc/4.2.4 100 10 's/(all[_-])*(gcc[-_])*//;'
+      patch-renumber.sh patches/gcc/4.2.3 patches/gcc/4.2.4 100 10
+      patch-renumber.sh /some/dir/my-patches patches/gcc/4.3.1 100 10 's/(all[_-])*(gcc[-_])*//;'
 _EOF_
 }
 
-[ $# -lt 3 -o $# -gt 4 ] && { doUsage; exit 1; }
-[ -d "${1}" ] || { doUsage; exit 1; }
+[ $# -lt 4 -o $# -gt 5 ] && { doUsage; exit 1; }
 
-dir="${1}"
-cpt="${2}"
-inc="${3}"
-sed_re="${4}"
-
-case "$(LC_ALL=C hg id "${dir}" 2>/dev/null)" in
-    "") CMD="";;
-    *)  CMD="hg";;
-esac
+src="${1}"
+dst="${2}"
+cpt="${3}"
+inc="${4}"
+sed_re="${5}"
+if [ ! -d "${src}" ]; then
+    printf "%s: '%s': not a directory\n" "${myname}" "${src}"
+    exit 1
+fi
+if [ -d "${dst}" ]; then
+    printf "%s: '%s': directory already exists\n" "${myname}" "${dst}"
+    exit 1
+fi
 
-if [ "${FAKE}" = "y" ]; then
-    CMD="echo ${CMD}"
+Q=
+if [ -n "${FAKE}" ]; then
+    printf "%s: won't do anything: FAKE='%s'\n" "${myname}" "${FAKE}"
+    Q="echo"
 fi
 
-for p in "${dir}"/*.patch*; do
+${Q} mkdir -pv "${dst}"
+for p in "${src}/"*.patch*; do
     [ -e "${p}" ] || { echo "No such file '${p}'"; exit 1; }
     newname="$(printf "%03d-%s"                                     \
                       "${cpt}"                                      \
@@ -48,6 +58,6 @@ for p in "${dir}"/*.patch*; do
                                        -e "${sed_re}"               \
                         )"                                          \
               )"
-    [ "${p}" = "${dir}/${newname}" ] || ${CMD} mv -v "${p}" "${dir}/${newname}"
+    ${Q} cp -v "${p}" "${dst}/${newname}"
     cpt=$((cpt+inc))
 done
-- 
cgit v1.2.3


From c863d223faa360a299181b071c03d7a447644175 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Thu, 12 Nov 2009 18:42:13 +0100
Subject: scripts: be POSIXly correct in helper scripts

Fix helper scripts to be POSIXly correct: don't expect '.' (the dot
builtin) to search CWD if it is not in $PATH.
---
 scripts/addToolVersion.sh | 7 ++++++-
 scripts/patch-renumber.sh | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'scripts/patch-renumber.sh')

diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh
index b71ee9ae..876d4e24 100755
--- a/scripts/addToolVersion.sh
+++ b/scripts/addToolVersion.sh
@@ -5,7 +5,12 @@ set -e
 myname="$0"
 
 # Parse the tools' paths configuration
-. "paths.mk"
+# It is expected that this script is only to be run from the
+# source directory of crosstool-NG, so it is trivial to find
+# paths.mk (we can't use  ". paths.mk", as POSIX states that
+# $PATH should be searched for, and $PATH most probably doe
+# not include "."), hence the "./".
+. "./paths.mk"
 
 doHelp() {
     cat <<-EOF
diff --git a/scripts/patch-renumber.sh b/scripts/patch-renumber.sh
index 08ec1beb..3604df57 100755
--- a/scripts/patch-renumber.sh
+++ b/scripts/patch-renumber.sh
@@ -5,7 +5,12 @@ set -e
 myname="$0"
 
 # Parse the tools' paths configuration
-. "paths.mk"
+# It is expected that this script is only to be run from the
+# source directory of crosstool-NG, so it is trivial to find
+# paths.mk (we can't use  ". paths.mk", as POSIX states that
+# $PATH should be searched for, and $PATH most probably doe
+# not include "."), hence the "./".
+. "./paths.mk"
 
 doUsage() {
   cat <<_EOF_
-- 
cgit v1.2.3