| 1 |
commit: d59b71937aad3de9a855562736a25de7f522cf4b |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 19 22:42:13 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 20 07:10:03 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d59b7193 |
| 7 |
|
| 8 |
targets: Inline run_default_funcs() function |
| 9 |
|
| 10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 11 |
|
| 12 |
targets/support/chroot-functions.sh | 17 ++++++----------- |
| 13 |
1 file changed, 6 insertions(+), 11 deletions(-) |
| 14 |
|
| 15 |
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
| 16 |
index b531eb6a..307a9042 100755 |
| 17 |
--- a/targets/support/chroot-functions.sh |
| 18 |
+++ b/targets/support/chroot-functions.sh |
| 19 |
@@ -303,15 +303,6 @@ show_debug() { |
| 20 |
fi |
| 21 |
} |
| 22 |
|
| 23 |
-run_default_funcs() { |
| 24 |
- if [ "${RUN_DEFAULT_FUNCS}" != "no" ] |
| 25 |
- then |
| 26 |
- update_env_settings |
| 27 |
- setup_features |
| 28 |
- show_debug |
| 29 |
- fi |
| 30 |
-} |
| 31 |
- |
| 32 |
create_handbook_icon() { |
| 33 |
# This function creates a local icon to the Gentoo Handbook |
| 34 |
echo "[Desktop Entry] |
| 35 |
@@ -330,5 +321,9 @@ readonly locales=" |
| 36 |
C.UTF8 UTF-8 |
| 37 |
" |
| 38 |
|
| 39 |
-# We do this everywhere, so why not put it in this script |
| 40 |
-run_default_funcs |
| 41 |
+if [[ ${RUN_DEFAULT_FUNCS} != no ]] |
| 42 |
+then |
| 43 |
+ update_env_settings |
| 44 |
+ setup_features |
| 45 |
+ show_debug |
| 46 |
+fi |
Archives