From 6c3c6966a1ee9c3153b3e698c17b192bf7469df9 Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <tolzmann@molgen.mpg.de>
Date: Tue, 7 Feb 2012 10:06:09 +0100
Subject: [PATCH 1/9] config-lib: use XDG_DOWNLOAD_DIR as default for
 BEE_DOWNLOADDIR

we don't set or export XDG_DOWNLOAD_DIR, but if set we use it as the
default value for BEE_DOWNLOADDIR
---
 src/beelib.config.sh.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/beelib.config.sh.in b/src/beelib.config.sh.in
index 995242e..c5c5036 100644
--- a/src/beelib.config.sh.in
+++ b/src/beelib.config.sh.in
@@ -187,6 +187,11 @@ function config_verify_builtin_config() {
     : ${BEE_REPOSITORY_BEEDIR:=${BEE_REPOSITORY_PREFIX}/bees}
     : ${BEE_REPOSITORY_PKGDIR:=${BEE_REPOSITORY_PREFIX}/pkgs}
     : ${BEE_REPOSITORY_BUILDARCHIVEDIR:=${BEE_REPOSITORY_PREFIX}/build-archives}
+
+    # XDG_DOWNLOAD_DIR defaults to: ${HOME}/Downloads
+    #    but since i don't like it we don't set XDG_DOWNLOAD_DIR but respect it
+    #    if set.
+    : ${BEE_DOWNLOADDIR:=${XDG_DOWNLOAD_DIR}}
     : ${BEE_DOWNLOADDIR:=${BEE_REPOSITORY_PREFIX}/downloads}
 }
 

From def5f9294667f793216f24a51987c6b8013eb150 Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <tolzmann@molgen.mpg.de>
Date: Tue, 7 Feb 2012 10:11:12 +0100
Subject: [PATCH 2/9] config-lib: change default of BEE_TMP_BUILDROOT

built-in default value of BEE_TMP_BUILDROOT changed

from BEE_TMP_TMPDIR/beeroot-USER
  to BEE_TMP_TMPDIR/bee-USER
---
 src/beelib.config.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/beelib.config.sh.in b/src/beelib.config.sh.in
index c5c5036..f6abd10 100644
--- a/src/beelib.config.sh.in
+++ b/src/beelib.config.sh.in
@@ -182,7 +182,7 @@ function config_verify_builtin_config() {
     : ${user:=${USERNAME}}
 
     : ${BEE_TMP_TMPDIR:=/tmp}
-    : ${BEE_TMP_BUILDROOT:=${BEE_TMP_TMPDIR}/beeroot-${user}}
+    : ${BEE_TMP_BUILDROOT:=${BEE_TMP_TMPDIR}/bee-${user}}
 
     : ${BEE_REPOSITORY_BEEDIR:=${BEE_REPOSITORY_PREFIX}/bees}
     : ${BEE_REPOSITORY_PKGDIR:=${BEE_REPOSITORY_PREFIX}/pkgs}

From 8e9d044d6c85155978ed0f72b6aa7f29ecbe1bfb Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <tolzmann@molgen.mpg.de>
Date: Tue, 7 Feb 2012 10:15:38 +0100
Subject: [PATCH 3/9] config-lib: change default of BEE_REPOSITORY_BEEDIR and
 BEE_REPOSITORY_PKGDIR

built-in default value of BEE_REPOSITORY_BEEDIR changed

from BEE_REPOSITORY_PREFIX/bees
  to BEE_REPOSITORY_PREFIX/bee-files

built-in default value of BEE_REPOSITORY_PKGDIR changed

from BEE_REPOSITORY_PREFIX/pkgs
  to BEE_REPOSITORY_PREFIX/packages
---
 conf/beerc              | 4 ++--
 src/beelib.config.sh.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/beerc b/conf/beerc
index 8446f36..856a7b0 100644
--- a/conf/beerc
+++ b/conf/beerc
@@ -27,9 +27,9 @@
     #: ${BEE_REPOSITORY_PREFIX=/usr/src/bee}
 #fi
 
-#: ${BEE_REPOSITORY_BEEDIR:=${BEE_REPOSITORY_PREFIX}/bees}
-#: ${BEE_REPOSITORY_PKGDIR:=${BEE_REPOSITORY_PREFIX}/pkgs}
 #: ${BEE_REPOSITORY_BUILDARCHIVEDIR:=${BEE_REPOSITORY_PREFIX}/build-archives}
+#: ${BEE_REPOSITORY_BEEDIR:=${BEE_REPOSITORY_PREFIX}/bee-files}
+#: ${BEE_REPOSITORY_PKGDIR:=${BEE_REPOSITORY_PREFIX}/packages}
 
 # DEFAULT CONFIGURE SETTINGS
 #: ${PREFIX:=/usr}
diff --git a/src/beelib.config.sh.in b/src/beelib.config.sh.in
index f6abd10..421d6cc 100644
--- a/src/beelib.config.sh.in
+++ b/src/beelib.config.sh.in
@@ -184,8 +184,8 @@ function config_verify_builtin_config() {
     : ${BEE_TMP_TMPDIR:=/tmp}
     : ${BEE_TMP_BUILDROOT:=${BEE_TMP_TMPDIR}/bee-${user}}
 
-    : ${BEE_REPOSITORY_BEEDIR:=${BEE_REPOSITORY_PREFIX}/bees}
-    : ${BEE_REPOSITORY_PKGDIR:=${BEE_REPOSITORY_PREFIX}/pkgs}
+    : ${BEE_REPOSITORY_BEEDIR:=${BEE_REPOSITORY_PREFIX}/bee-files}
+    : ${BEE_REPOSITORY_PKGDIR:=${BEE_REPOSITORY_PREFIX}/packages}
     : ${BEE_REPOSITORY_BUILDARCHIVEDIR:=${BEE_REPOSITORY_PREFIX}/build-archives}
 
     # XDG_DOWNLOAD_DIR defaults to: ${HOME}/Downloads

From e222f6dc5135c76568d5abca064981c2ff988062 Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <tolzmann@molgen.mpg.de>
Date: Tue, 7 Feb 2012 10:28:16 +0100
Subject: [PATCH 4/9] config-lib: renamed BEE_REPOSITORY_BUILDARCHIVEDIR to
 BEE_BUILDARCHIVEDIR

---
 conf/beerc              |  2 +-
 src/beelib.config.sh.in |  4 ++--
 src/beesh.sh.in         | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/conf/beerc b/conf/beerc
index 856a7b0..b08b2de 100644
--- a/conf/beerc
+++ b/conf/beerc
@@ -27,9 +27,9 @@
     #: ${BEE_REPOSITORY_PREFIX=/usr/src/bee}
 #fi
 
-#: ${BEE_REPOSITORY_BUILDARCHIVEDIR:=${BEE_REPOSITORY_PREFIX}/build-archives}
 #: ${BEE_REPOSITORY_BEEDIR:=${BEE_REPOSITORY_PREFIX}/bee-files}
 #: ${BEE_REPOSITORY_PKGDIR:=${BEE_REPOSITORY_PREFIX}/packages}
+#: ${BEE_BUILDARCHIVEDIR:=${BEE_REPOSITORY_PREFIX}/build-archives}
 
 # DEFAULT CONFIGURE SETTINGS
 #: ${PREFIX:=/usr}
diff --git a/src/beelib.config.sh.in b/src/beelib.config.sh.in
index 421d6cc..1768598 100644
--- a/src/beelib.config.sh.in
+++ b/src/beelib.config.sh.in
@@ -186,7 +186,7 @@ function config_verify_builtin_config() {
 
     : ${BEE_REPOSITORY_BEEDIR:=${BEE_REPOSITORY_PREFIX}/bee-files}
     : ${BEE_REPOSITORY_PKGDIR:=${BEE_REPOSITORY_PREFIX}/packages}
-    : ${BEE_REPOSITORY_BUILDARCHIVEDIR:=${BEE_REPOSITORY_PREFIX}/build-archives}
+    : ${BEE_BUILDARCHIVEDIR:=${BEE_REPOSITORY_PREFIX}/build-archives}
 
     # XDG_DOWNLOAD_DIR defaults to: ${HOME}/Downloads
     #    but since i don't like it we don't set XDG_DOWNLOAD_DIR but respect it
@@ -254,7 +254,7 @@ function config_export() {
     export BEE_REPOSITORY_PREFIX
     export BEE_REPOSITORY_BEEDIR
     export BEE_REPOSITORY_PKGDIR
-    export BEE_REPOSITORY_BUILDARCHIVEDIR
+    export BEE_BUILDARCHIVEDIR
     export BEE_DOWNLOADDIR
     export BEE_METADIR
     export BEE_CACHEDIR
diff --git a/src/beesh.sh.in b/src/beesh.sh.in
index 7177527..677756a 100644
--- a/src/beesh.sh.in
+++ b/src/beesh.sh.in
@@ -121,7 +121,7 @@ function check_repositories() {
 
     mkdir -pv ${BEE_REPOSITORY_BEEDIR}
     mkdir -pv ${BEE_REPOSITORY_PKGDIR}
-    mkdir -pv ${BEE_REPOSITORY_BUILDARCHIVEDIR}
+    mkdir -pv ${BEE_BUILDARCHIVEDIR}
 
     if [ ! -w "${BEE_REPOSITORY_BEEDIR}" ] ; then
         print_error " !! ${BEE_REPOSITORY_BEEDIR} not writable"
@@ -133,7 +133,7 @@ function check_repositories() {
         r=1
     fi
 
-    if [ ! -w "${BEE_REPOSITORY_BUILDARCHIVEDIR}" ] ; then
+    if [ ! -w "${BEE_BUILDARCHIVEDIR}" ] ; then
         print_error " !! ${BEE_REPOSITORY_BEEDIR} not writable"
         r=1
     fi
@@ -434,11 +434,11 @@ function bee_pkg_pack() {
 function bee_archivebuild() {
     [ "${OPT_ARCHIVE_BUILD}" != "yes" ] && return
 
-    if [ ! -d "${BEE_REPOSITORY_BUILDARCHIVEDIR}" ] ; then
-        mkdir -pv ${BEE_REPOSITORY_BUILDARCHIVEDIR}
+    if [ ! -d "${BEE_BUILDARCHIVEDIR}" ] ; then
+        mkdir -pv ${BEE_BUILDARCHIVEDIR}
     fi
 
-    archive="${BEE_REPOSITORY_BUILDARCHIVEDIR}/${PKGALLPKG}.beebuild.tar.bz2"
+    archive="${BEE_BUILDARCHIVEDIR}/${PKGALLPKG}.beebuild.tar.bz2"
 
     print_info " -> saving build environment.."
     print_info "${COLOR_CYAN}${archive}"

From f5c35029664b00043c3b21838b7a069dfc53da31 Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <tolzmann@molgen.mpg.de>
Date: Tue, 7 Feb 2012 10:37:51 +0100
Subject: [PATCH 5/9] config-lib: change default of BEE_METADIR for users

built-in default value of BEE_METADIR for users changed

from XDG_DATA_HOME/beemta
  to XDG_DATA_HOME/bee
---
 src/beelib.config.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/beelib.config.sh.in b/src/beelib.config.sh.in
index 1768598..477ac7a 100644
--- a/src/beelib.config.sh.in
+++ b/src/beelib.config.sh.in
@@ -173,7 +173,7 @@ function config_verify_builtin_config() {
         : ${BEE_CACHEDIR=/var/cache/bee}
     else # user
         : ${BEE_REPOSITORY_PREFIX=${XDG_DATA_HOME}/beeroot}
-        : ${BEE_METADIR=${XDG_DATA_HOME}/beemeta}
+        : ${BEE_METADIR=${XDG_DATA_HOME}/bee}
         : ${BEE_CACHEDIR=${XDG_CACHE_HOME}/bee}
     fi
 

From 2fd256b23720008bbf01966d485d2fca2356a22a Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <tolzmann@molgen.mpg.de>
Date: Tue, 7 Feb 2012 10:43:24 +0100
Subject: [PATCH 6/9] config-lib: change default of BEE_REPOSITORY_PREFIX for
 users

built-in default value of BEE_REPOSITORY_PREFIX for users changed

from XDG_DATA_HOME/beeroot
  to HOME/.local/src/bee
---
 src/beelib.config.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/beelib.config.sh.in b/src/beelib.config.sh.in
index 477ac7a..f8e9bca 100644
--- a/src/beelib.config.sh.in
+++ b/src/beelib.config.sh.in
@@ -172,7 +172,7 @@ function config_verify_builtin_config() {
         : ${BEE_METADIR=${BEE_XDG_DATADIR}/bee}
         : ${BEE_CACHEDIR=/var/cache/bee}
     else # user
-        : ${BEE_REPOSITORY_PREFIX=${XDG_DATA_HOME}/beeroot}
+        : ${BEE_REPOSITORY_PREFIX=${HOME}/.local/src/bee}
         : ${BEE_METADIR=${XDG_DATA_HOME}/bee}
         : ${BEE_CACHEDIR=${XDG_CACHE_HOME}/bee}
     fi

From d55dbc6ecfc573448ad0c1251b1bee6e6eb9894b Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <tolzmann@molgen.mpg.de>
Date: Tue, 7 Feb 2012 11:49:15 +0100
Subject: [PATCH 7/9] config-lib: handle all deprecated config variables and
 try to migrate to new values

we migrate the old config by using the old dirs and move them to the new locations:

if the new location already exists - nothing is migrated.
if the old location does not exist - nothing is migrated.

also we warn about renamed variables, if they are set.
---
 src/beelib.config.sh.in | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/beelib.config.sh.in b/src/beelib.config.sh.in
index f8e9bca..bc0ef3a 100644
--- a/src/beelib.config.sh.in
+++ b/src/beelib.config.sh.in
@@ -75,14 +75,35 @@ function config_init_base_config() {
     XDG_DATA_DIRS=$(beeuniq -d : ${XDG_DATA_DIRS//:/ })
 }
 
+
+function deprecated_mv() {
+    local what=${1}
+    local from=${2}
+    local to=${3}
+
+    if [ -e "${from}" -a ! -e "${to}" ] ; then
+        print_error "WARNING: migrating deprecated config ${what}:"
+        print_error "WARNING:   moving ${from} -> ${to}"
+        mkdir -vp "${to%/*}"
+        mv -v "${from}" "${to}"
+    fi
+}
+
 function config_handle_deprecated_config() {
-    : ${DOTBEERC:=${HOME}/.beerc}
-    if [ -r "${DOTBEERC}" ] ; then
-        print_error \
-            "ERROR: support for ~/.beerc is" \
-            " deprecated please move it to" \
-            " ${XDG_CONFIG_HOME}/bee/beerc"
-        exit 1
+    deprecated_mv "DOTBEERC"              "${HOME}/.beerc" "${XDG_CONFIG_HOME}/bee/beerc"
+    deprecated_mv "BEE_REPOSITORY_PREFIX" "${XDG_DATA_HOME}/beeroot" "${BEE_REPOSITORY_PREFIX}"
+    deprecated_mv "BEE_METADIR"           "${XDG_DATA_HOME}/beemeta" "${BEE_METADIR}"
+    deprecated_mv "BEE_REPOSITORY_BEEDIR" "${BEE_REPOSITORY_PREFIX}/bees" "${BEE_REPOSITORY_BEEDIR}"
+    deprecated_mv "BEE_REPOSITORY_PKGDIR" "${BEE_REPOSITORY_PREFIX}/pkgs" "${BEE_REPOSITORY_PKGDIR}"
+    deprecated_mv "BEE_DOWNLOADDIR"       "${BEE_REPOSITORY_PREFIX}/downloads" "${BEE_DOWNLOADDIR}"
+    deprecated_mv "BEE_TMP_BUILDROOT"     "${BEE_TMP_TMPDIR}/beeroot-${USER}" "${BEE_TMP_BUILDROOT}"
+
+    if [ ! -z "${BEE_REPOSITORY_BUILDARCHIVEDIR}" ] ; then
+        print_error "WARNING: ignored deprecated variable BEE_REPOSITORY_BUILDARCHIVEDIR please use BEE_BUILDARCHIVEDIR=${BEE_REPOSITORY_BUILDARCHIVEDIR}"
+    fi
+
+    if [ ! -z "${DOTBEERC}" ] ; then
+        print_error "WARNING: ignored deprecated variable DOTBEERC please use BEE_USER_CONFIG_FILE=${DOTBEERC}"
     fi
 }
 
@@ -242,12 +263,12 @@ function expand_prefix_variables() {
 
 function config_init() {
     config_init_base_config
-    config_handle_deprecated_config
     config_load_local_config
     config_load_user_config
     config_load_system_config
     config_verify_builtin_config
     config_verify_builtin_prefixes
+    config_handle_deprecated_config
 }
 
 function config_export() {

From 09d6d5c573921f6abaa1696d7484721947e4d077 Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <tolzmann@molgen.mpg.de>
Date: Wed, 8 Feb 2012 14:33:39 +0100
Subject: [PATCH 8/9] config-lib: exit on deprecated variable errors

---
 src/beelib.config.sh.in | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/beelib.config.sh.in b/src/beelib.config.sh.in
index bc0ef3a..f1a46c9 100644
--- a/src/beelib.config.sh.in
+++ b/src/beelib.config.sh.in
@@ -90,6 +90,26 @@ function deprecated_mv() {
 }
 
 function config_handle_deprecated_config() {
+
+    local exit_deprecated=0
+
+    if [ ! -z "${DOTBEERC}" ] ; then
+        print_error "ERROR: deprecated variable DOTBEERC is set."
+        print_error "ERROR: please use BEE_USER_CONFIG_FILE=${DOTBEERC}"
+        exit_deprecated=1
+    fi
+
+    if [ ! -z "${BEE_REPOSITORY_BUILDARCHIVEDIR}" ] ; then
+        print_error "ERROR: deprecated variable BEE_REPOSITORY_BUILDARCHIVEDIR is set."
+        print_error "ERROR: please use BEE_BUILDARCHIVEDIR=${BEE_REPOSITORY_BUILDARCHIVEDIR}"
+        exit_deprecated=1
+    fi
+
+    if [ ${exit_deprecated} == 1 ] ; then
+        print_error "ERROR: please fix depracted variable errors before continuing."
+        exit 1
+    fi
+
     deprecated_mv "DOTBEERC"              "${HOME}/.beerc" "${XDG_CONFIG_HOME}/bee/beerc"
     deprecated_mv "BEE_REPOSITORY_PREFIX" "${XDG_DATA_HOME}/beeroot" "${BEE_REPOSITORY_PREFIX}"
     deprecated_mv "BEE_METADIR"           "${XDG_DATA_HOME}/beemeta" "${BEE_METADIR}"
@@ -97,14 +117,6 @@ function config_handle_deprecated_config() {
     deprecated_mv "BEE_REPOSITORY_PKGDIR" "${BEE_REPOSITORY_PREFIX}/pkgs" "${BEE_REPOSITORY_PKGDIR}"
     deprecated_mv "BEE_DOWNLOADDIR"       "${BEE_REPOSITORY_PREFIX}/downloads" "${BEE_DOWNLOADDIR}"
     deprecated_mv "BEE_TMP_BUILDROOT"     "${BEE_TMP_TMPDIR}/beeroot-${USER}" "${BEE_TMP_BUILDROOT}"
-
-    if [ ! -z "${BEE_REPOSITORY_BUILDARCHIVEDIR}" ] ; then
-        print_error "WARNING: ignored deprecated variable BEE_REPOSITORY_BUILDARCHIVEDIR please use BEE_BUILDARCHIVEDIR=${BEE_REPOSITORY_BUILDARCHIVEDIR}"
-    fi
-
-    if [ ! -z "${DOTBEERC}" ] ; then
-        print_error "WARNING: ignored deprecated variable DOTBEERC please use BEE_USER_CONFIG_FILE=${DOTBEERC}"
-    fi
 }
 
 # load config: (bee/beerc)

From 0c4ffc46c3c317bd8a0e578f5277195122f37bc8 Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <tolzmann@molgen.mpg.de>
Date: Wed, 8 Feb 2012 14:42:11 +0100
Subject: [PATCH 9/9] config-lib: renamed BEE_REPOSITORY_*DIR to BEE_*DIR

BEE_REPOSITORY_BEEDIR => BEE_BEEDIR
BEE_REPOSITORY_PKGDIR => BEE_PKGDIR

in addition the undocumented and unused

BEE_REPOSITORY_PKGPATH => BEE_PKGPATH

was renamed...
---
 conf/beerc              |  4 ++--
 src/bee-install.sh.in   | 12 ++++++------
 src/bee-list.sh.in      | 10 +++++-----
 src/beelib.config.sh.in | 30 ++++++++++++++++++++++++------
 src/beesh.sh.in         | 34 +++++++++++++++++-----------------
 5 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/conf/beerc b/conf/beerc
index b08b2de..8087dda 100644
--- a/conf/beerc
+++ b/conf/beerc
@@ -27,8 +27,8 @@
     #: ${BEE_REPOSITORY_PREFIX=/usr/src/bee}
 #fi
 
-#: ${BEE_REPOSITORY_BEEDIR:=${BEE_REPOSITORY_PREFIX}/bee-files}
-#: ${BEE_REPOSITORY_PKGDIR:=${BEE_REPOSITORY_PREFIX}/packages}
+#: ${BEE_BEEDIR:=${BEE_REPOSITORY_PREFIX}/bee-files}
+#: ${BEE_PKGDIR:=${BEE_REPOSITORY_PREFIX}/packages}
 #: ${BEE_BUILDARCHIVEDIR:=${BEE_REPOSITORY_PREFIX}/build-archives}
 
 # DEFAULT CONFIGURE SETTINGS
diff --git a/src/bee-install.sh.in b/src/bee-install.sh.in
index cb59867..17289e7 100644
--- a/src/bee-install.sh.in
+++ b/src/bee-install.sh.in
@@ -112,17 +112,17 @@ pkg_install() {
     fi
 
     # install package from repository
-    if [ -f "${BEE_REPOSITORY_PKGDIR}/${search}" ] ; then
-         do_install "${BEE_REPOSITORY_PKGDIR}/${search}"
+    if [ -f "${BEE_PKGDIR}/${search}" ] ; then
+         do_install "${BEE_PKGDIR}/${search}"
          return
     fi
 
     for e in "" ".$(arch)" ".noarch" ".any" ; do
-        if [ -f "${BEE_REPOSITORY_PKGDIR}/${search}${e}.bee.tar.bz2" ] ; then
-            do_install "${BEE_REPOSITORY_PKGDIR}/${search}${e}.bee.tar.bz2"
+        if [ -f "${BEE_PKGDIR}/${search}${e}.bee.tar.bz2" ] ; then
+            do_install "${BEE_PKGDIR}/${search}${e}.bee.tar.bz2"
             return
-        elif [ -f "${BEE_REPOSITORY_PKGDIR}/${search}${e}.iee.tar.bz2" ] ; then
-            do_install "${BEE_REPOSITORY_PKGDIR}/${search}${e}.iee.tar.bz2"
+        elif [ -f "${BEE_PKGDIR}/${search}${e}.iee.tar.bz2" ] ; then
+            do_install "${BEE_PKGDIR}/${search}${e}.iee.tar.bz2"
             return
         fi
     done
diff --git a/src/bee-list.sh.in b/src/bee-list.sh.in
index 2a5fa33..1f9a6fc 100644
--- a/src/bee-list.sh.in
+++ b/src/bee-list.sh.in
@@ -69,16 +69,16 @@ list_installed() {
 
 #
 # lists available packages
-#   RETURNS a sorted list of packages available in ${BEE_REPOSITORY_PKGDIR}
-#   or in any directory in ${BEE_REPOSITORY_PKGPATH}
+#   RETURNS a sorted list of packages available in ${BEE_PKGDIR}
+#   or in any directory in ${BEE_PKGPATH}
 #
 list_available() {
     local IFS=":${IFS}"
     # preapre for repository pathes..
-    : ${BEE_REPOSITORY_PKGPATH:=${BEE_REPOSITORY_PKGDIR}}
+    : ${BEE_PKGPATH:=${BEE_PKGDIR}}
 
-    # replace all ':' with ' ' in BEE_REPOSITORY_PKGPATH
-    path=${BEE_REPOSITORY_PKGPATH//:/ }
+    # replace all ':' with ' ' in BEE_PKGPATH
+    path=${BEE_PKGPATH//:/ }
 
     search=""
     for p in $path ; do
diff --git a/src/beelib.config.sh.in b/src/beelib.config.sh.in
index f1a46c9..97467c1 100644
--- a/src/beelib.config.sh.in
+++ b/src/beelib.config.sh.in
@@ -105,6 +105,24 @@ function config_handle_deprecated_config() {
         exit_deprecated=1
     fi
 
+    if [ ! -z "${BEE_REPOSITORY_BEEDIR}" ] ; then
+        print_error "ERROR: deprecated variable BEE_REPOSITORY_BEEDIR is set."
+        print_error "ERROR: please use BEE_BEEDIR=${BEE_REPOSITORY_BEEDIR}"
+        exit_deprecated=1
+    fi
+
+    if [ ! -z "${BEE_REPOSITORY_PKGDIR}" ] ; then
+        print_error "ERROR: deprecated variable BEE_REPOSITORY_PKGDIR is set."
+        print_error "ERROR: please use BEE_PKGDIR=${BEE_REPOSITORY_PKGDIR}"
+        exit_deprecated=1
+    fi
+
+    if [ ! -z "${BEE_REPOSITORY_PKGPATH}" ] ; then
+        print_error "ERROR: deprecated variable BEE_REPOSITORY_PKGPATH is set."
+        print_error "ERROR: please use BEE_PKGPATH=${BEE_REPOSITORY_PKGPATH}"
+        exit_deprecated=1
+    fi
+
     if [ ${exit_deprecated} == 1 ] ; then
         print_error "ERROR: please fix depracted variable errors before continuing."
         exit 1
@@ -113,8 +131,8 @@ function config_handle_deprecated_config() {
     deprecated_mv "DOTBEERC"              "${HOME}/.beerc" "${XDG_CONFIG_HOME}/bee/beerc"
     deprecated_mv "BEE_REPOSITORY_PREFIX" "${XDG_DATA_HOME}/beeroot" "${BEE_REPOSITORY_PREFIX}"
     deprecated_mv "BEE_METADIR"           "${XDG_DATA_HOME}/beemeta" "${BEE_METADIR}"
-    deprecated_mv "BEE_REPOSITORY_BEEDIR" "${BEE_REPOSITORY_PREFIX}/bees" "${BEE_REPOSITORY_BEEDIR}"
-    deprecated_mv "BEE_REPOSITORY_PKGDIR" "${BEE_REPOSITORY_PREFIX}/pkgs" "${BEE_REPOSITORY_PKGDIR}"
+    deprecated_mv "BEE_BEEDIR"            "${BEE_REPOSITORY_PREFIX}/bees" "${BEE_BEEDIR}"
+    deprecated_mv "BEE_PKGDIR"            "${BEE_REPOSITORY_PREFIX}/pkgs" "${BEE_PKGDIR}"
     deprecated_mv "BEE_DOWNLOADDIR"       "${BEE_REPOSITORY_PREFIX}/downloads" "${BEE_DOWNLOADDIR}"
     deprecated_mv "BEE_TMP_BUILDROOT"     "${BEE_TMP_TMPDIR}/beeroot-${USER}" "${BEE_TMP_BUILDROOT}"
 }
@@ -217,8 +235,8 @@ function config_verify_builtin_config() {
     : ${BEE_TMP_TMPDIR:=/tmp}
     : ${BEE_TMP_BUILDROOT:=${BEE_TMP_TMPDIR}/bee-${user}}
 
-    : ${BEE_REPOSITORY_BEEDIR:=${BEE_REPOSITORY_PREFIX}/bee-files}
-    : ${BEE_REPOSITORY_PKGDIR:=${BEE_REPOSITORY_PREFIX}/packages}
+    : ${BEE_BEEDIR:=${BEE_REPOSITORY_PREFIX}/bee-files}
+    : ${BEE_PKGDIR:=${BEE_REPOSITORY_PREFIX}/packages}
     : ${BEE_BUILDARCHIVEDIR:=${BEE_REPOSITORY_PREFIX}/build-archives}
 
     # XDG_DOWNLOAD_DIR defaults to: ${HOME}/Downloads
@@ -285,8 +303,8 @@ function config_init() {
 
 function config_export() {
     export BEE_REPOSITORY_PREFIX
-    export BEE_REPOSITORY_BEEDIR
-    export BEE_REPOSITORY_PKGDIR
+    export BEE_BEEDIR
+    export BEE_PKGDIR
     export BEE_BUILDARCHIVEDIR
     export BEE_DOWNLOADDIR
     export BEE_METADIR
diff --git a/src/beesh.sh.in b/src/beesh.sh.in
index 677756a..4c198b1 100644
--- a/src/beesh.sh.in
+++ b/src/beesh.sh.in
@@ -119,22 +119,22 @@ function check_repositories() {
     r=0
     print_info "==> checking repositories .."
 
-    mkdir -pv ${BEE_REPOSITORY_BEEDIR}
-    mkdir -pv ${BEE_REPOSITORY_PKGDIR}
+    mkdir -pv ${BEE_BEEDIR}
+    mkdir -pv ${BEE_PKGDIR}
     mkdir -pv ${BEE_BUILDARCHIVEDIR}
 
-    if [ ! -w "${BEE_REPOSITORY_BEEDIR}" ] ; then
-        print_error " !! ${BEE_REPOSITORY_BEEDIR} not writable"
+    if [ ! -w "${BEE_BEEDIR}" ] ; then
+        print_error " !! ${BEE_BEEDIR} not writable"
         r=1
     fi
 
-    if [ ! -w "${BEE_REPOSITORY_PKGDIR}" ] ; then
-        print_error " !! ${BEE_REPOSITORY_PKGDIR} not writable"
+    if [ ! -w "${BEE_PKGDIR}" ] ; then
+        print_error " !! ${BEE_PKGDIR} not writable"
         r=1
     fi
 
     if [ ! -w "${BEE_BUILDARCHIVEDIR}" ] ; then
-        print_error " !! ${BEE_REPOSITORY_BEEDIR} not writable"
+        print_error " !! ${BEE_BUILDARCHIVEDIR} not writable"
         r=1
     fi
 
@@ -390,12 +390,12 @@ function bee_pkg_pack() {
         cp ${p} ${D}/PATCHES
     done
 
-    if [ ! -d "${BEE_REPOSITORY_PKGDIR}" ] ; then
-        mkdir -pv ${BEE_REPOSITORY_PKGDIR}
+    if [ ! -d "${BEE_PKGDIR}" ] ; then
+        mkdir -pv ${BEE_PKGDIR}
     fi
 
     pkgname=${PKGALLPKG}.bee.tar.bz2
-    pkgfile=${BEE_REPOSITORY_PKGDIR}/${pkgname}
+    pkgfile=${BEE_PKGDIR}/${pkgname}
 
     print_info " -> creating package ${pkgname} .."
     print_info "${COLOR_CYAN}${pkgfile}"
@@ -418,16 +418,16 @@ function bee_pkg_pack() {
     rm ${DUMP}
 
     beefilename=${BEE##*/}
-    beefiledest=${BEE_REPOSITORY_BEEDIR}/${beefilename}
+    beefiledest=${BEE_BEEDIR}/${beefilename}
 
     print_info "-> saving bee-file ${beefilename} .."
     print_info "${COLOR_CYAN}${beefiledest}"
 
-    if [ ! -d "${BEE_REPOSITORY_BEEDIR}" ] ; then
-        mkdir -pv ${BEE_REPOSITORY_BEEDIR}
+    if [ ! -d "${BEE_BEEDIR}" ] ; then
+        mkdir -pv ${BEE_BEEDIR}
     fi
 
-    cp -v ${BEE} ${BEE_REPOSITORY_BEEDIR}
+    cp -v ${BEE} ${BEE_BEEDIR}
 }
 
 
@@ -453,10 +453,10 @@ function bee_archivebuild() {
         --absolute-names \
         ${S} ${B} \
         ${bee_FETCHED_FILES[@]} \
-        ${BEE_REPOSITORY_BEEDIR}/${BEE##*/} \
+        ${BEE_BEEDIR}/${BEE##*/} \
         --transform="s,^${BEEWORKDIR},${PKGALLPKG}," \
         --transform="s,^${F},${PKGALLPKG}/files," \
-        --transform="s,^${BEE_REPOSITORY_BEEDIR},${PKGALLPKG}/files,"
+        --transform="s,^${BEE_BEEDIR},${PKGALLPKG}/files,"
 }
 
 function load_buildmagic() {
@@ -726,5 +726,5 @@ echo
 
 if [ "${OPT_INSTALL}" = "yes" ] ; then
     print_info "installing ${PKGALLPKG} .."
-    bee install ${OPT_FORCE:+-f} ${BEE_REPOSITORY_PKGDIR}/${PKGALLPKG}.bee.tar.bz2
+    bee install ${OPT_FORCE:+-f} ${BEE_PKGDIR}/${PKGALLPKG}.bee.tar.bz2
 fi