From c29599361a0a6f60d3c9dad7a788a369b4e14ea7 Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Mon, 8 Feb 2021 08:14:49 +0100 Subject: [PATCH 18/18] rulesets_save.sh: make it possible to keep files. Keep the upgraded rulesets for later inspection even if nothing fails as long as KEEP_RESULT_IN_DIR is set to a folder. The result is stored there. See osdn #41517 --- tests/rulesets_save.sh.in | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/rulesets_save.sh.in b/tests/rulesets_save.sh.in index f3dd5c690c..4e7b7dd667 100644 --- a/tests/rulesets_save.sh.in +++ b/tests/rulesets_save.sh.in @@ -4,6 +4,8 @@ # Exits with 0 when each specified ruleset or, if no rulesets are specified, # each ruleset that is developed with Freeciv, can be saved using ruleup. # Exits with 1 if not. +# If KEEP_RESULT_IN_DIR is set to a folder the saved result will be kept +# there for later inspection even if nothing fails. if test x$1 = x ; then # Try to save all rulesets that are developed with Freeciv @@ -13,8 +15,14 @@ else rulesets=$@ fi -# Put upgrade results in a temporary folder. -tmpdir=`mktemp -d` +if test x$KEEP_RESULT_IN_DIR = x ; then + # Put upgrade results in a temporary folder. + tmpdir=`mktemp -d` +else + # Save the upgrade result to the specified folder + tmpdir=$KEEP_RESULT_IN_DIR +fi + if [ -d "${tmpdir}" ] ; then cp -R @abs_top_srcdir@/data/ruledit/ "${tmpdir}" || exit 1 cp -R @abs_top_srcdir@/data/default/ "${tmpdir}" || exit 1 @@ -57,7 +65,10 @@ for ruleset in $rulesets; do fi done -rm -rf "${tmpdir}" +if test x$KEEP_RESULT_IN_DIR = x ; then + # Should not be kept + rm -rf "${tmpdir}" +fi echo "No resaving problems detected." exit 0 -- 2.20.1