From 166aa788c57b5f842f89787b7d22dc47bc746602 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 3 May 2014 11:29:42 +0000 Subject: move calling update-patches into a separate mksh script update-patches2 handling quoting much better Signed-off-by: Thorsten Glaser --- scripts/update-patches2 | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 scripts/update-patches2 (limited to 'scripts/update-patches2') diff --git a/scripts/update-patches2 b/scripts/update-patches2 new file mode 100644 index 000000000..8f8711af7 --- /dev/null +++ b/scripts/update-patches2 @@ -0,0 +1,46 @@ +#!/usr/bin/env mksh +#- +# Copyright © 2014 +# Thorsten Glaser +# +# Provided that these terms and disclaimer and all copyright notices +# are retained or reproduced in an accompanying document, permission +# is granted to deal in this work without restriction, including un‐ +# limited rights to use, publicly perform, distribute, sell, modify, +# merge, give away, or sublicence. +# +# This work is provided “AS IS” and WITHOUT WARRANTY of any kind, to +# the utmost extent permitted by applicable law, neither express nor +# implied; without malicious intent or gross negligence. In no event +# may a licensor, author or contributor be held liable for indirect, +# direct, other damage, loss, or other issues arising in any way out +# of dealing in the work, even if advised of the possibility of such +# damage or existence of a defect, except proven that it results out +# of said person’s immediate fault when using the work as intended. + +PATCH_LIST='patch-* *.patch' +CURDIR=$PWD +export CURDIR PATCH_LIST + +mksh "${TOPDIR}"/scripts/update-patches |& +first=1 +set -A toedit +while IFS= read -p -r; do + if (( first )); then + if [[ $REPLY = FAIL ]]; then + rm -rf "${WRKDIR1}.orig" + exit 1 + fi + first=0 + fi + toedit+=("$REPLY") +done +if (( !first )); then + print -n 'edit patches: ' + read + cd patches + ${VISUAL:-${EDITOR:-vi}} "${toedit[@]}" + cd .. +fi +rm -rf "${WRKDIR1}.orig" +exit 0 -- cgit v1.2.3 From 8a0005b61300850e11fe19202ccd2118736ec661 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 3 May 2014 11:36:16 +0000 Subject: pass patches NUL-terminated Signed-off-by: Thorsten Glaser --- scripts/update-patches2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/update-patches2') diff --git a/scripts/update-patches2 b/scripts/update-patches2 index 8f8711af7..2b8349bcf 100644 --- a/scripts/update-patches2 +++ b/scripts/update-patches2 @@ -25,7 +25,7 @@ export CURDIR PATCH_LIST mksh "${TOPDIR}"/scripts/update-patches |& first=1 set -A toedit -while IFS= read -p -r; do +while IFS= read -p -d '' -r; do if (( first )); then if [[ $REPLY = FAIL ]]; then rm -rf "${WRKDIR1}.orig" -- cgit v1.2.3 From b66aa23b5661650340eadfb619d305989f7f8eec Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 3 May 2014 13:00:26 +0000 Subject: delete old temporary files of previous run, in case it aborts Signed-off-by: Thorsten Glaser --- scripts/update-patches2 | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts/update-patches2') 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 -- cgit v1.2.3