Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 11 years ago
parent
commit
30de1b74c8
2 changed files with 2 additions and 1 deletions
  1. 1 1
      scripts/update-patches
  2. 1 0
      scripts/update-patches2

+ 1 - 1
scripts/update-patches

@@ -157,7 +157,7 @@ while IFS= read -p -d '' -r file; do
 			# did it change? mark it as changed
 			# did it change? mark it as changed
 			tfile=$(print -r -- "$file" | $TRANSFORM)
 			tfile=$(print -r -- "$file" | $TRANSFORM)
 			if eval diff "$(print -r -- "${DIFF_FLAGS}" | sed \
 			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"
 				rm "$i.new"
 			else
 			else
 				print -ru2 -- "Patch $i for $file updated"
 				print -ru2 -- "Patch $i for $file updated"

+ 1 - 0
scripts/update-patches2

@@ -22,6 +22,7 @@ PATCH_LIST='patch-* *.patch'
 CURDIR=$PWD
 CURDIR=$PWD
 export CURDIR PATCH_LIST
 export CURDIR PATCH_LIST
 
 
+rm -f patches/*.new
 mksh "${TOPDIR}"/scripts/update-patches |&
 mksh "${TOPDIR}"/scripts/update-patches |&
 first=1
 first=1
 set -A toedit
 set -A toedit