Merge branch 'cleanup'

* cleanup: cleanup: Add functions to wrap bee-tools to increase readability
mariux64 · Mar 10, 2013 · 7807570 · 7807570
2 parents f009e28 + 69b1eed
commit 7807570
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 22 deletions.
diff --git a/src/bee-check.sh.in b/src/bee-check.sh.in
@@ -37,6 +37,11 @@ fi
 VERSION=${BEE_VERSION}
 
 : ${BEE_BINDIR:=@BINDIR@}
+: ${BEE_LIBEXECDIR:=@LIBEXECDIR@}
+
+function bee-list() {
+    ${BEE_LIBEXECDIR}/bee/bee.d/bee-list "${@}"
+}
 
 ###############################################################################
 ##
@@ -58,10 +63,10 @@ function pkg_check_all() {
 ##
 ##
 function pkg_check_deps() {
-    installed=$(${BEE_LIBEXECDIR}/bee/bee.d/bee-list --installed --by-pkgfullname ${1})
+    installed=$(bee-list --installed --by-pkgfullname ${1})
 
     if [ ! "${installed}" -a $OPT_F -gt 0 ] ; then
-        installed=$(${BEE_LIBEXECDIR}/bee/bee.d/bee-list --installed "${1}")
+        installed=$(bee-list --installed "${1}")
     fi
 
     if [ "${installed}" ] ; then
@@ -76,10 +81,10 @@ function pkg_check_deps() {
 ##
 ##
 function pkg_check() {
-    installed=$(${BEE_LIBEXECDIR}/bee/bee.d/bee-list --installed --by-pkgfullname ${1})
+    installed=$(bee-list --installed --by-pkgfullname ${1})
 
     if [ ! "${installed}" -a $OPT_F -gt 0 ] ; then
-        installed=$(${BEE_LIBEXECDIR}/bee/bee.d/bee-list --installed "${1}")
+        installed=$(bee-list --installed "${1}")
     fi
 
     if [ "${installed}" ] ; then
@@ -89,7 +94,7 @@ function pkg_check() {
         return 0
     fi
 
-    installed=$(${BEE_LIBEXECDIR}/bee/bee.d/bee-list --installed "${1}")
+    installed=$(bee-list --installed "${1}")
 
     if [ "${installed}" ] ; then
         echo "packages matching '${1}':"

diff --git a/src/bee-install.sh.in b/src/bee-install.sh.in
@@ -31,6 +31,19 @@ fi
 VERSION=${BEE_VERSION}
 
 : ${BEE_BINDIR:=@BINDIR@}
+: ${BEE_LIBEXECDIR:=@LIBEXECDIR@}
+
+function bee-cache() {
+    ${BEE_LIBEXECDIR}/bee/bee.d/bee-cache "${@}"
+}
+
+function bee-list() {
+    ${BEE_LIBEXECDIR}/bee/bee.d/bee-list "${@}"
+}
+
+function bee-remove() {
+    ${BEE_LIBEXECDIR}/bee/bee.d/bee-remove "${@}"
+}
 
 function debug_msg() {
     if [ "${OPT_DEBUG}" != "1" ] ; then
@@ -147,7 +160,7 @@ function pkg_install() {
     fi
 
     # pkg not found yet - lets search a little deeper
-    available=( $(${BEE_LIBEXECDIR}/bee/bee.d/bee-list --available "${search}") )
+    available=( $(bee-list --available "${search}") )
 
     if [ ${#available[@]} -eq 0 ] ; then
         echo >&2 "bee-install: ${search}: No packages available matching your query."
@@ -183,11 +196,11 @@ function pkg_install() {
         return
     fi
 
-    available=( $(${BEE_LIBEXECDIR}/bee/bee.d/bee-list --available --exact "${fullname}" | grep ${search}) )
+    available=( $(bee-list --available --exact "${fullname}" | grep ${search}) )
 
     maxavail=$(${BEE_BINDIR}/beeversion -max ${available[@]})
 
-    fileavail=( $(${BEE_LIBEXECDIR}/bee/bee.d/bee-list --available --exact --display-pathname ${maxavail}) )
+    fileavail=( $(bee-list --available --exact --display-pathname ${maxavail}) )
 
     assert "${#fileavail[@]}" = 1
 
@@ -202,7 +215,7 @@ function do_remove() {
             echo "REMOVE ${p}"
             continue
         fi
-        ${BEE_LIBEXECDIR}/bee/bee.d/bee-remove ${p}
+        bee-remove ${p}
     done
 }
 
@@ -236,8 +249,8 @@ function do_install() {
     debug_msg "do_install file=${file}"
     debug_msg "do_install pkg=${pkg}"
 
-    installed=( $(${BEE_LIBEXECDIR}/bee/bee.d/bee-list --installed --exact "${fullname}" | grep -v "${pkg}") )
-    isinstalled=( $(${BEE_LIBEXECDIR}/bee/bee.d/bee-list --installed --exact "${pkg}") )
+    installed=( $(bee-list --installed --exact "${fullname}" | grep -v "${pkg}") )
+    isinstalled=( $(bee-list --installed --exact "${pkg}") )
 
     assert ${#isinstalled[@]} -le 1
 
@@ -344,10 +357,6 @@ function do_install() {
     return
 }
 
-function bee-cache() {
-    ${BEE_LIBEXECDIR}/bee/bee.d/bee-cache "${@}"
-}
-
 function do_install_file() {
     local file=$1
     local beefile="$(${BEE_BINDIR}/beeversion ${pkg} --format='%F').bee"

diff --git a/src/bee-list.sh.in b/src/bee-list.sh.in
@@ -43,8 +43,14 @@ fi
 VERSION=${BEE_VERSION}
 
 : ${BEE_BINDIR:=@BINDIR@}
+: ${BEE_LIBEXECDIR:=@LIBEXECDIR@}
+
 : ${BEESORT:=${BEE_BINDIR}/beesort}
 
+function bee-list() {
+    ${BEE_LIBEXECDIR}/bee/bee.d/bee-list "${@}"
+}
+
 #
 # BUGS TO FIX/FEATURES TO ADD:
 #   - check for grep -P support and use it..
@@ -244,7 +250,7 @@ function list_updatable() {
     pkgs=$(${BEE_BINDIR}/beeversion --max ${pkgs})
     for a in ${pkgs} ; do
         pname=$(${BEE_BINDIR}/beeversion --pkgfullname "${a}")
-        installed=$(${BEE_LIBEXECDIR}/bee/bee.d/bee-list --exact "${pname}")
+        installed=$(bee-list --exact "${pname}")
         if [ -z "${installed}" ] ; then
             if [ "${OPT_UNINSTALLED}" = "yes" ] ; then
                 echo -e "${COLOR_INSTALLABLE}${a}${COLOR_NORMAL}"

diff --git a/src/bee-query.sh.in b/src/bee-query.sh.in
@@ -31,6 +31,11 @@ fi
 VERSION=${BEE_VERSION}
 
 : ${BEE_BINDIR:=@BINDIR@}
+: ${BEE_LIBEXECDIR:=@LIBEXECDIR@}
+
+function bee-list() {
+    ${BEE_LIBEXECDIR}/bee/bee.d/bee-list "${@}"
+}
 
 BEESEP=${BEE_BINDIR}/beesep
 
@@ -79,7 +84,7 @@ function get_files() {
 function get_pkgs() {
     f=$1
 
-    for pkg in $(${BEE_LIBEXECDIR}/bee/bee.d/bee-list --installed) ; do
+    for pkg in $(bee-list --installed) ; do
 
         if egrep -q "file=.*${f}" "${BEE_METADIR}/${pkg}/CONTENT" ; then
             echo ${pkg}

diff --git a/src/beesh.sh.in b/src/beesh.sh.in
@@ -46,6 +46,14 @@ VERSION=${BEE_VERSION}
 # load libs
 . ${BEE_LIBEXECDIR}/bee/beelib.config.sh
 
+function bee-cache() {
+    ${BEE_LIBEXECDIR}/bee/bee.d/bee-cache "${@}"
+}
+
+function bee-install() {
+    ${BEE_LIBEXECDIR}/bee/bee.d/bee-install "${@}"
+}
+
 ###############################################################################
 ###############################################################################
 ###############################################################################
@@ -1049,10 +1057,6 @@ bee_crosscheck
 
 bee_pkg_pack
 
-function bee-cache() {
-    ${BEE_LIBEXECDIR}/bee/bee.d/bee-cache "${@}"
-}
-
 function bee_check_conflicts() {
     ${BEE_LIBEXECDIR}/bee/bee-cache-inventory CONTENT \
         --prepend "${PKGALLPKG} " \
@@ -1095,5 +1099,5 @@ echo
 if [ "${OPT_INSTALL}" = "yes" ] ; then
 
     print_info "installing ${PKGALLPKG} .."
-    ${BEE_LIBEXECDIR}/bee/bee.d/bee-install ${OPT_FORCE:+-f} ${OPT_UPDATE:+-u} ${BEE_PKGDIR}/${PKGALLPKG}.bee.tar.bz2
+    bee-install ${OPT_FORCE:+-f} ${OPT_UPDATE:+-u} ${BEE_PKGDIR}/${PKGALLPKG}.bee.tar.bz2
 fi