aboutsummaryrefslogtreecommitdiff
path: root/hooks
diff options
context:
space:
mode:
authorAvatar Mike Kelly <pioto@pioto.org> 2008-10-26 01:20:29 -0400
committerAvatar Mike Kelly <pioto@pioto.org> 2008-10-26 01:20:29 -0400
commitfa60a909b04ba84d79556e7df7dd7d22e513302c (patch)
treec01fec90b39d1bf0bcf014e8f3c580ef8699ee7f /hooks
parent2775c7df7ac65dd9524924cf7d7bb0227956356c (diff)
downloadpaludis-fa60a909b04ba84d79556e7df7dd7d22e513302c.tar.gz
paludis-fa60a909b04ba84d79556e7df7dd7d22e513302c.tar.xz
Add --with-config-framework=[eselect|eclectic].
Defaults to eselect. Lets Exherbo finally drop eselect. Fixes: ticket:657
Diffstat (limited to 'hooks')
-rw-r--r--hooks/Makefile.am.m43
-rwxr-xr-xhooks/eselect_env_update.bash.in (renamed from hooks/eselect_env_update.bash)2
-rwxr-xr-xhooks/news.hook.in (renamed from hooks/news.hook)4
3 files changed, 6 insertions, 3 deletions
diff --git a/hooks/Makefile.am.m4 b/hooks/Makefile.am.m4
index c1ce500df..d9871a63c 100644
--- a/hooks/Makefile.am.m4
+++ b/hooks/Makefile.am.m4
@@ -298,3 +298,6 @@ TESTS_ENVIRONMENT = env \
TOP_SRCDIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)`" \
bash $(top_srcdir)/hooks/run_test.bash
+all-local :
+ chmod +x $(builddir)/news.hook $(builddir)/eselect_env_update.bash
+
diff --git a/hooks/eselect_env_update.bash b/hooks/eselect_env_update.bash.in
index 3371e4415..7a8166fb7 100755
--- a/hooks/eselect_env_update.bash
+++ b/hooks/eselect_env_update.bash.in
@@ -26,7 +26,7 @@ fi
echo
einfo_unhooked "Regenerating environment..."
-eselect env update || ewarn "Regeneration failed"
+@CONFIG_FRAMEWORK@ env update || ewarn "Regeneration failed"
einfo_unhooked "Done regenerating environment"
true
diff --git a/hooks/news.hook b/hooks/news.hook.in
index 0f7039f98..b5eeb0832 100755
--- a/hooks/news.hook
+++ b/hooks/news.hook.in
@@ -21,12 +21,12 @@ check_for_news()
export PATH="$(${PALUDIS_EBUILD_DIR}/utils/canonicalise ${PALUDIS_EBUILD_DIR}/utils/ ):${PATH}"
export ROOT="${ROOT}"
source ${PALUDIS_ECHO_FUNCTIONS_DIR:-${PALUDIS_EBUILD_DIR}}/echo_functions.bash
- count="$(eselect news count )"
+ count="$(@CONFIG_FRAMEWORK@ news count )"
done_echo=
if [[ ${count} -gt 0 ]] ; then
[[ -z "${done_echo}" ]] && echo ; done_echo=yes
- ewarn "You have ${count} unread news items (use 'eselect news' to read)"
+ ewarn "You have ${count} unread news items (use '@CONFIG_FRAMEWORK@ news' to read)"
elif [[ "${HOOK/pretend}" == "${HOOK}" ]] ; then
[[ -z "${done_echo}" ]] && echo ; done_echo=yes
einfo_unhooked "No unread news items found"