diff options
| author |   Alexey Neyman <stilor@att.net> | 2016-12-14 02:40:47 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2017-01-20 02:08:29 (GMT) |
| commit | 3e4d4870c9b7506c7a114fdb8789f78fd551c171 (patch) | |
| tree | a6289993f026feb3a83ca98621d7f5297cf4f232 | |
| parent | 955f5bc0b8a879ba5d1b9a65a31cc235c9fd9be8 (diff) | |
Simplify config saving.
Instead of hardcoding defaults in saveSample.sh.in, have the same
defaults in config. Then we can just remove them when saving the
config.
| -rw-r--r-- | config/global/logging.in | 3 | ||||
| -rw-r--r-- | config/global/paths.in | 4 | ||||
| -rw-r--r-- | scripts/saveSample.sh.in | 19 |
3 files changed, 14 insertions, 12 deletions
diff --git a/config/global/logging.in b/config/global/logging.in index 0c77e88..a7e7696 100644 --- a/config/global/logging.in +++ b/config/global/logging.in @@ -5,8 +5,7 @@ comment "Logging" choice bool prompt "Maximum log level to see:" - default LOG_INFO if !DEBUG_CT - default LOG_DEBUG if DEBUG_CT + default LOG_EXTRA config LOG_ERROR bool diff --git a/config/global/paths.in b/config/global/paths.in index 5e9bcc4..308d8d1 100644 --- a/config/global/paths.in +++ b/config/global/paths.in @@ -5,7 +5,7 @@ comment "Paths" config LOCAL_TARBALLS_DIR string prompt "Local tarballs directory" if ! BACKEND - default "" + default "${HOME}/src" help If you have previously downloaded the tarballs, enter the PATH where you stored them here. @@ -14,7 +14,7 @@ config SAVE_TARBALLS bool prompt "Save new tarballs" if ! BACKEND depends on LOCAL_TARBALLS_DIR != "" || BACKEND - default y if BACKEND + default y help If you say 'y' here, new downloaded tarballs will be saved in the directory you entered above. diff --git a/scripts/saveSample.sh.in b/scripts/saveSample.sh.in index 4fa1c87..646c189 100644 --- a/scripts/saveSample.sh.in +++ b/scripts/saveSample.sh.in @@ -40,14 +40,17 @@ esac samp_dir="samples/${samp_name}" mkdir -p "${samp_dir}" -# Tweak the .config file. -cp .config .defconfig -"${sed}" -r -e 's|^(CT_PREFIX_DIR)=.*|\1="${HOME}/x-tools/${CT_TARGET}"|;' \ - -e 's|^# CT_LOG_TO_FILE is not set$|CT_LOG_TO_FILE=y|;' \ - -e 's|^# CT_LOG_FILE_COMPRESS is not set$|CT_LOG_FILE_COMPRESS=y|;' \ - -e 's|^(CT_LOCAL_TARBALLS_DIR)=.*|\1="${HOME}/src"|;' \ - <.config \ - >.defconfig +# Tweak the .config file: remove the options that we want to keep +# at default setting in samples. +force_default_opts=( \ + PREFIX_DIR LOG_TO_FILE LOG_FILE_COMPRESS \ + LOCAL_TARBALLS_DIR SAVE_TARBALLS \ + LOG_ERROR LOG_WARN LOG_INFO LOG_EXTRA LOG_ALL LOG_DEBUG \ + LOG_PROGRESS_BAR + ) +regexp=${force_default_opts[*]} +regexp=${regexp// /|} +grep -v -E '^(# )?CT_('"${regexp}"')' .config > .defconfig # Function to copy a file to the sample directory # Needed in case the file is already there (think of a previously available sample) |