From f78001144b56993de751be78983b9d01a9d73dd7 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Sat, 2 May 2020 02:38:26 +0100 Subject: [PATCH] move and rename Common_config_files() for better encapsulation, and for consistency with other config file handling functions in the new location. Gbp-Dch: Ignore --- functions/conffile.sh | 5 +++++ functions/init.sh | 7 +------ scripts/build/config | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/functions/conffile.sh b/functions/conffile.sh index bd766c2bd..09be0bcc6 100755 --- a/functions/conffile.sh +++ b/functions/conffile.sh @@ -9,6 +9,11 @@ ## under certain conditions; see COPYING for details. +Common_conffiles () +{ + echo "config/all config/common config/bootstrap config/chroot config/binary config/source" +} + Get_conffiles () { local FILES diff --git a/functions/init.sh b/functions/init.sh index cc70e91fa..d39bf1b5a 100755 --- a/functions/init.sh +++ b/functions/init.sh @@ -9,11 +9,6 @@ ## under certain conditions; see COPYING for details. -Common_config_files () -{ - echo "config/all config/common config/bootstrap config/chroot config/binary config/source" -} - Auto_build_config () { # Automatically build config @@ -27,7 +22,7 @@ Init_config_data () { Arguments "${@}" - Read_conffiles $(Common_config_files) + Read_conffiles $(Common_conffiles) Prepare_config # Apt v2.0.1 introduced color support, but it needs to be explicitly enabled. diff --git a/scripts/build/config b/scripts/build/config index 318a2cc8c..dc79d08f9 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -217,7 +217,7 @@ Local_arguments () fi # Dump conffile contents - Print_conffiles $(Common_config_files) + Print_conffiles $(Common_conffiles) # Dump contents of directories that contain text files local DIRECTORY @@ -939,7 +939,7 @@ then fi # Reading existing saved configuration -Read_conffiles $(Common_config_files) +Read_conffiles $(Common_conffiles) # Processing arguments again to overwrite just-read previously saved settings as necessary Local_arguments "${@}"