[PATCH 4/4] cr_tests: Use stdout for rewrite-cr-header.sh output

[PATCH 4/4] cr_tests: Use stdout for rewrite-cr-header.sh output

[Matt Helsley]

Instead of overwriting cr.h in the current directory write the output
of rewrite-cr-header.sh to stdout and let whoever invokes the script
decide what to do with the output. This should make it slightly
easier to test and make the script more widely usable (e.g. in user-cr).

Signed-off-by: Matt Helsley <matthltc-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
Cc: Linux Containers <containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>
---
 rewrite-cr-header.sh |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/rewrite-cr-header.sh b/rewrite-cr-header.sh
index ffc6f62..97f39fc 100755
--- a/rewrite-cr-header.sh
+++ b/rewrite-cr-header.sh
@@ -40,9 +40,6 @@ fi
 
 ################################################################################
 
-mv cr.h cr.h.bak || exit -1
-
-(
 COND='#if'
 set -e
 echo '/* AUTOMATICALLY GENERATED by rewrite-cr-header.sh */'
@@ -88,9 +85,3 @@ while read UNISTDH ; do
 	COND='#elif'
 done
 echo -e '#else\n#error "Architecture does not have definitons for __NR_(checkpoint|restart)"\n#endif'
-) > cr.h || {
-	mv -f cr.h.bak cr.h
-	exit -1
-}
-
-rm -f cr.h.bak
-- 
1.5.6.3

Re: [PATCH 4/4] cr_tests: Use stdout for rewrite-cr-header.sh output

[Serge E. Hallyn]

Quoting Matt Helsley (matthltc-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org):
> Instead of overwriting cr.h in the current directory write the output
> of rewrite-cr-header.sh to stdout and let whoever invokes the script
> decide what to do with the output. This should make it slightly
> easier to test and make the script more widely usable (e.g. in user-cr).
> 
> Signed-off-by: Matt Helsley <matthltc-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> Cc: Linux Containers <containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>

All applied, thanks.

-serge

> ---
>  rewrite-cr-header.sh |    9 ---------
>  1 files changed, 0 insertions(+), 9 deletions(-)
> 
> diff --git a/rewrite-cr-header.sh b/rewrite-cr-header.sh
> index ffc6f62..97f39fc 100755
> --- a/rewrite-cr-header.sh
> +++ b/rewrite-cr-header.sh
> @@ -40,9 +40,6 @@ fi
> 
>  ################################################################################
> 
> -mv cr.h cr.h.bak || exit -1
> -
> -(
>  COND='#if'
>  set -e
>  echo '/* AUTOMATICALLY GENERATED by rewrite-cr-header.sh */'
> @@ -88,9 +85,3 @@ while read UNISTDH ; do
>  	COND='#elif'
>  done
>  echo -e '#else\n#error "Architecture does not have definitons for __NR_(checkpoint|restart)"\n#endif'
> -) > cr.h || {
> -	mv -f cr.h.bak cr.h
> -	exit -1
> -}
> -
> -rm -f cr.h.bak
> -- 
> 1.5.6.3