From 2a8b8a02adc0ae9af71dd041039c4ef05b6144a6 Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Thu, 24 Jul 2008 11:37:36 +0200 Subject: [PATCH] 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 --- scripts/makepkg.sh.in | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ae19983..9f6f3c7 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 return $R_DEPS_SATISFIED } -- 1.5.6