aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-02-20 11:34:47 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-02-20 11:34:47 +0000
commit086350e5c73c33a5b5046e7d0aa7e39691419ad7 (patch)
tree01ad960a271820780e7b87588ac132d7571d760e
parentce70599afb4c28eb9e75246fffca8f127a5a526f (diff)
downloadpaludis-086350e5c73c33a5b5046e7d0aa7e39691419ad7.tar.gz
paludis-086350e5c73c33a5b5046e7d0aa7e39691419ad7.tar.xz
Move ${ROOT} cleaning so it happens for uninstall too.
-rw-r--r--paludis/repositories/e/ebuild/0/builtin_init.bash2
-rw-r--r--paludis/repositories/e/ebuild/0/builtin_killold.bash2
-rwxr-xr-xpaludis/repositories/e/ebuild/ebuild.bash2
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_init.bash2
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_killold.bash2
5 files changed, 2 insertions, 8 deletions
diff --git a/paludis/repositories/e/ebuild/0/builtin_init.bash b/paludis/repositories/e/ebuild/0/builtin_init.bash
index d5df8e9..19821d5 100644
--- a/paludis/repositories/e/ebuild/0/builtin_init.bash
+++ b/paludis/repositories/e/ebuild/0/builtin_init.bash
@@ -18,8 +18,6 @@
builtin_init()
{
- export ROOT="${ROOT//+(\/)//}"
-
local a
for a in PALUDIS_NON_EMPTY_VARIABLES ${PALUDIS_NON_EMPTY_VARIABLES} ; do
[[ -z "${!a}" ]] && die "\$${a} unset or empty"
diff --git a/paludis/repositories/e/ebuild/0/builtin_killold.bash b/paludis/repositories/e/ebuild/0/builtin_killold.bash
index fc1967a..450f590 100644
--- a/paludis/repositories/e/ebuild/0/builtin_killold.bash
+++ b/paludis/repositories/e/ebuild/0/builtin_killold.bash
@@ -18,8 +18,6 @@
builtin_killold()
{
- export ROOT="${ROOT//+(\/)//}"
-
local a
for a in PF CATEGORY PALUDIS_TMPDIR ; do
[[ -z "${!a}" ]] && die "\$${a} unset or empty"
diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
index c7af2cb..c81cf73 100755
--- a/paludis/repositories/e/ebuild/ebuild.bash
+++ b/paludis/repositories/e/ebuild/ebuild.bash
@@ -52,6 +52,8 @@ fi
shopt -s expand_aliases
shopt -s extglob
+export ROOT="${ROOT//+(\/)//}"
+
export EBUILD_PROGRAM_NAME="$0"
if [[ -n "${PALUDIS_EBUILD_DIR_FALLBACK}" ]] ; then
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash
index 19939c0..2b99e66 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash
@@ -18,8 +18,6 @@
builtin_init()
{
- export ROOT="${ROOT//+(\/)//}"
-
local a
for a in PALUDIS_NON_EMPTY_VARIABLES ${PALUDIS_NON_EMPTY_VARIABLES} ; do
[[ -z "${!a}" ]] && die "\$${a} unset or empty"
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_killold.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_killold.bash
index b8493f4..b268daa 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_killold.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_killold.bash
@@ -18,8 +18,6 @@
builtin_killold()
{
- export ROOT="${ROOT//+(\/)//}"
-
local a
for a in PF CATEGORY PALUDIS_TMPDIR ; do
[[ -z "${!a}" ]] && die "\$${a} unset or empty"