Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 27/37] targets: Inline run_default_funcs() function
Date: Wed, 21 Oct 2020 00:24:45
Message-Id: 20201021002344.378131-27-mattst88@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 01/37] catalyst: Use early return to unindent code by Matt Turner
1 Signed-off-by: Matt Turner <mattst88@g.o>
2 ---
3 targets/support/chroot-functions.sh | 17 ++++++-----------
4 1 file changed, 6 insertions(+), 11 deletions(-)
5
6 diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
7 index b531eb6a..307a9042 100755
8 --- a/targets/support/chroot-functions.sh
9 +++ b/targets/support/chroot-functions.sh
10 @@ -303,15 +303,6 @@ show_debug() {
11 fi
12 }
13
14 -run_default_funcs() {
15 - if [ "${RUN_DEFAULT_FUNCS}" != "no" ]
16 - then
17 - update_env_settings
18 - setup_features
19 - show_debug
20 - fi
21 -}
22 -
23 create_handbook_icon() {
24 # This function creates a local icon to the Gentoo Handbook
25 echo "[Desktop Entry]
26 @@ -330,5 +321,9 @@ readonly locales="
27 C.UTF8 UTF-8
28 "
29
30 -# We do this everywhere, so why not put it in this script
31 -run_default_funcs
32 +if [[ ${RUN_DEFAULT_FUNCS} != no ]]
33 +then
34 + update_env_settings
35 + setup_features
36 + show_debug
37 +fi
38 --
39 2.26.2