From d557fb638d449203878c8e92c29f7f7a75f0dfe1 Mon Sep 17 00:00:00 2001
From: Matthias Ruester <ruester@molgen.mpg.de>
Date: Fri, 27 Jan 2012 14:18:21 +0100
Subject: [PATCH] beelib: try harder to get the user name

also check $USER and $USERNAME for getting the user name
---
 src/beelib.config.sh.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/beelib.config.sh.in b/src/beelib.config.sh.in
index 371a393..995242e 100644
--- a/src/beelib.config.sh.in
+++ b/src/beelib.config.sh.in
@@ -177,8 +177,12 @@ function config_verify_builtin_config() {
         : ${BEE_CACHEDIR=${XDG_CACHE_HOME}/bee}
     fi
 
+    user=${LOGNAME}
+    : ${user:=${USER}}
+    : ${user:=${USERNAME}}
+
     : ${BEE_TMP_TMPDIR:=/tmp}
-    : ${BEE_TMP_BUILDROOT:=${BEE_TMP_TMPDIR}/beeroot-${LOGNAME}}
+    : ${BEE_TMP_BUILDROOT:=${BEE_TMP_TMPDIR}/beeroot-${user}}
 
     : ${BEE_REPOSITORY_BEEDIR:=${BEE_REPOSITORY_PREFIX}/bees}
     : ${BEE_REPOSITORY_PKGDIR:=${BEE_REPOSITORY_PREFIX}/pkgs}