diff options
| author |   Alexey Neyman <stilor@att.net> | 2019-02-09 23:55:16 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2019-02-09 23:55:16 (GMT) |
| commit | 74a53fdf3eb383f09bdbf0d4adf8d2e26f838bd1 (patch) | |
| tree | 59f7c27a3d83f8ede979e58407c0a40c2d75b10b /scripts | |
| parent | 09cb590847e5e26e5bb029c1a2693cfa7a1e99b6 (diff) | |
Use enhanced framework for 'ct-ng update-samples'
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/show-config.sh | 1 | ||||
| -rw-r--r-- | scripts/version-check.sh | 10 |
2 files changed, 2 insertions, 9 deletions
diff --git a/scripts/show-config.sh b/scripts/show-config.sh index 4bc82e1..36ade9e 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 f49b1d8..1f4fea4 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 |