summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Chantry <shiningxc@gmail.com>2008-07-24 11:37:36 +0200
committerDan McGee <dan@archlinux.org>2008-07-29 21:48:20 -0500
commit0e0a8461357baeb4bea23b09a56c003cf04fd0db (patch)
tree07ec6ee0688d4b06d6c2024cc58301d26afb1297
parent428b2fd8cc5ad4a0e7b2dcd1d097fb57237ea7a8 (diff)
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 <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in9
1 files 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
}