From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9D1FA138359 for ; Wed, 21 Oct 2020 00:24:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0FAEE0AB5; Wed, 21 Oct 2020 00:24:44 +0000 (UTC) Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EAB26E0AB5 for ; Wed, 21 Oct 2020 00:24:44 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id r10so353397pgb.10 for ; Tue, 20 Oct 2020 17:24:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Nd0gkR3YsuilUDt0O2OSIpFUewkOe7WJAmBdY9w5e9c=; b=bUoME1jHU2BaRk3AvebYxCiYqKIUiVUeqK5OcEOYAcGefRtIyz+Jp7r6u6c3F3TccV jOqB5KO07eMoMC0ftx7h0kRBXjmHay7lbdzJv8q80ofZ8l/gDM0Q5/WbIlba3/cYw73J Mt8CrqVS6MOzAaaV/h6pVyAplQ7m1TKpc+9uMP2qQ/ZdCRdbw6AWuQxDwmQE+aT25VQk 1v5b6euPZT8Z23jap31DkXve5lkQk3ncJh7fe5H7PtAB4onE8Kvpjtcyr2OnxKIXdIsE LfIzGS8EWfKBb4LMPpd7J/GGiA+gV/z29UZMLDNZ8dgy1Tu4/0zy+Vk4ThOQuqnj4iPM SwXw== X-Gm-Message-State: AOAM531q6It4U89753RhwvKU988zS5RjS9HI0bowkxYGCh6zFRhYl5z7 7Fsu/h5iF1CUgCpeEJvcSgBv5omU5BGzmA== X-Google-Smtp-Source: ABdhPJzrLYQrexefEJQTQuS9skZkDdPc+iBOehK0owWobV2HdMaYce4hIeLqxaNWDs3+3oeFUxXgeQ== X-Received: by 2002:a63:4661:: with SMTP id v33mr752241pgk.163.1603239883694; Tue, 20 Oct 2020 17:24:43 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id c12sm243231pjq.50.2020.10.20.17.24.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 17:24:42 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 27/37] targets: Inline run_default_funcs() function Date: Tue, 20 Oct 2020 17:23:34 -0700 Message-Id: <20201021002344.378131-27-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021002344.378131-1-mattst88@gentoo.org> References: <20201021002344.378131-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: f2521339-df9e-44b2-ad71-1db290d54eb0 X-Archives-Hash: aa58dd40f788d0b678fcd95a78ec482e Signed-off-by: Matt Turner --- 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 -- 2.26.2