From 0e0a8461357baeb4bea23b09a56c003cf04fd0db Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Thu, 24 Jul 2008 11:37:36 +0200 Subject: makepkg : use /etc/profile This fixes FS#9486. source /etc/profile instead of all individual files in /etc/profile.d/* (which is done by /etc/profile anyway). Signed-off-by: Xavier Chantry Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 379e9d8b..83124385 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -343,13 +343,8 @@ handledeps() { fi fi - # rerun any additional sh scripts found in /etc/profile.d/ - local script - for script in /etc/profile.d/*.sh; do - if [ -x $script ]; then - source $script &>/dev/null - fi - done + # we might need the new system environment + source /etc/profile &>/dev/null return $R_DEPS_SATISFIED } -- cgit v1.2.3-24-g4f1b