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

@@ -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

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

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

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

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