From 74a53fdf3eb383f09bdbf0d4adf8d2e26f838bd1 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sat, 9 Feb 2019 15:55:16 -0800
Subject: Use enhanced framework for 'ct-ng update-samples'

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 scripts/show-config.sh   |  1 +
 scripts/version-check.sh | 10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'scripts')

diff --git a/scripts/show-config.sh b/scripts/show-config.sh
index 4bc82e1a..36ade9ec 100644
--- a/scripts/show-config.sh
+++ b/scripts/show-config.sh
@@ -72,6 +72,7 @@ dump_single_sample()
     esac
     printf "[%s" "${sample_type}"
     [ -f "${sample_top}/samples/${sample}/broken" ] && printf "B" || printf "."
+    [ "${CT_CONFIG_VERSION}" != "${CT_CONFIG_VERSION_CURRENT}" ] && printf "O" || printf "."
     [ "${CT_EXPERIMENTAL}" = "y" ] && printf "X" || printf "."
     printf "]   %s\n" "${sample}"
     if [ ${verbose} -ne 0 ]; then
diff --git a/scripts/version-check.sh b/scripts/version-check.sh
index f49b1d8d..1f4fea41 100644
--- a/scripts/version-check.sh
+++ b/scripts/version-check.sh
@@ -141,7 +141,6 @@ set_opt_and_val()
 
 # Main upgrade driver. One version at a time, read line by line, interpret
 # the options and replace anything that needs replacing.
-cp "${CFGFILE}" "${CFGFILE}.before-upgrade"
 input="${CFGFILE}"
 while :; do
     # Purge any possibly stale values
@@ -181,7 +180,7 @@ while :; do
             q=
             if set_opt_and_val; then
                 case "${opt}" in
-                    CT_CONFIG_VERSION_CURRENT=*|CT_CONFIG_VERSION=*)
+                    CT_CONFIG_VERSION_CURRENT|CT_CONFIG_VERSION)
                         continue
                         ;;
                 esac
@@ -213,10 +212,3 @@ while :; do
     # keep the versions where there is such a dependency.
 done
 mv "${CFGFILE}.${MY_CONFIG_VERSION_CURRENT}" "${CFGFILE}"
-cp "${CFGFILE}" "${CFGFILE}.before-olddefconfig"
-cat >&2 <<EOF
-
-Done. The original '${CFGFILE}' has been saved as '${CFGFILE}.before-upgrade'.
-Will now run through 'ct-ng olddefconfig'.  The intermediate configuration (after the upgrade script,
-but before running 'ct-ng olddefconfig') has been saved as '${CFGFILE}.before-olddefconfig'.
-EOF
-- 
cgit v1.2.3