commit: 1ef11ad8950e12aa4fe0e11c2deaab8989f87fd7 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Mon Oct 19 22:42:13 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Oct 20 02:50:08 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1ef11ad8
targets: Inline run_default_funcs() function Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> targets/support/chroot-functions.sh | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index b531eb6a..307a9042 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -303,15 +303,6 @@ show_debug() { fi } -run_default_funcs() { - if [ "${RUN_DEFAULT_FUNCS}" != "no" ] - then - update_env_settings - setup_features - show_debug - fi -} - create_handbook_icon() { # This function creates a local icon to the Gentoo Handbook echo "[Desktop Entry] @@ -330,5 +321,9 @@ readonly locales=" C.UTF8 UTF-8 " -# We do this everywhere, so why not put it in this script -run_default_funcs +if [[ ${RUN_DEFAULT_FUNCS} != no ]] +then + update_env_settings + setup_features + show_debug +fi