summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-03 15:03:19 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-03 15:03:19 +0200
commit30de1b74c89a3b04176a93d5214aa5186f0a2a75 (patch)
tree840dd8227aba03d122fb51a840f045b1d6998e65
parent48adb589d006c3bd0389ee5aea5b2fd636f31048 (diff)
parente8b64ae830c3b612899c496317329f09ab31e703 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--scripts/update-patches2
-rw-r--r--scripts/update-patches21
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/update-patches b/scripts/update-patches
index 438cba2e1..3d5424ff0 100644
--- a/scripts/update-patches
+++ b/scripts/update-patches
@@ -157,7 +157,7 @@ while IFS= read -p -d '' -r file; do
# did it change? mark it as changed
tfile=$(print -r -- "$file" | $TRANSFORM)
if eval diff "$(print -r -- "${DIFF_FLAGS}" | sed \
- "s#@@#${tfile}#g")" "$i" "$i.new" 1>&2; then
+ "s#@@#${tfile}#g")" '"$i" "$i.new"' 1>&2; then
rm "$i.new"
else
print -ru2 -- "Patch $i for $file updated"
diff --git a/scripts/update-patches2 b/scripts/update-patches2
index 2b8349bcf..5b95f33f9 100644
--- a/scripts/update-patches2
+++ b/scripts/update-patches2
@@ -22,6 +22,7 @@ PATCH_LIST='patch-* *.patch'
CURDIR=$PWD
export CURDIR PATCH_LIST
+rm -f patches/*.new
mksh "${TOPDIR}"/scripts/update-patches |&
first=1
set -A toedit