Merge branch 'absolut-pathnames'

* absolut-pathnames: bee-tools: call beeprograms with absolut path (@BINDIR@) beesh: call beeprograms with absolut path (@BINDIR@)
mariux64 · Jul 7, 2011 · 2837f97 · 2837f97
2 parents 2f2a439 + 91414c4
commit 2837f97
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/src/bee-check.sh.in b/src/bee-check.sh.in
@@ -19,7 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-BEESEP=beesep
+BEESEP=@BINDIR@/beesep
 
 ###############################################################################
 ###############################################################################
@@ -171,7 +171,7 @@ do_check_deps() {
 
     echo -e "[${pkg}]"
 
-    eval $(beeversion "${pkg}")
+    eval $(@BINDIR@/beeversion "${pkg}")
 
     echo "    type     = package"
     echo "    provides = ${PKGNAME}"

diff --git a/src/bee-init.sh.in b/src/bee-init.sh.in
@@ -46,7 +46,7 @@ function bee_versionify() {
         return
     fi
 
-    eval $(beeversion ${beefile} 2>/dev/null)
+    eval $(@BINDIR@/beeversion ${beefile} 2>/dev/null)
 
     if [ -z "${PKGREVISION}" ] ; then
         return

diff --git a/src/bee-install.sh.in b/src/bee-install.sh.in
@@ -119,7 +119,7 @@ pkg_install() {
     done
 
     available=$(${BEE_LIBEXECDIR}/bee/bee.d/bee-list --available "${search}")
-    subsearch=( $(beecut -d '-' "${search}") )
+    subsearch=( $(@BINDIR@/beecut -d '-' "${search}") )
     nss=${#subsearch[*]}
 
     install_candidate=
@@ -131,7 +131,7 @@ pkg_install() {
 
         found=
         for a in ${available} ; do
-            p=$(beeversion --pkgfullname "${a}")
+            p=$(@BINDIR@/beeversion --pkgfullname "${a}")
             debug_msg "  against $p ($a)"
 
             if [ "${p}" = "${sss}" ] ; then
@@ -151,7 +151,7 @@ pkg_install() {
 
         if [ -n "${install_candidate}" ] ; then
             debug_msg "install candidates: ${install_candidate}"
-            to_bee_installed=$(beeversion -max ${install_candidate})
+            to_bee_installed=$(@BINDIR@/beeversion -max ${install_candidate})
             debug_msg "   => and the winner is:  ${to_bee_installed}"
             pkg_install ${to_bee_installed}
             break
@@ -178,11 +178,11 @@ pkg_install() {
 get_installed_versions() {
     local pkg=${1}
 
-    local pname=$(beeversion --pkgfullname ${pkg})
+    local pname=$(@BINDIR@/beeversion --pkgfullname ${pkg})
     local list
 
     for i in $(${BEE_LIBEXECDIR}/bee/bee.d/bee-list -i "${pname}") ; do
-        local installed=$(beeversion --pkgfullname ${i})
+        local installed=$(@BINDIR@/beeversion --pkgfullname ${i})
         if [ "${installed}" = "${pname}" ] ; then
             list="${list:+${list} }${i}"
         fi
@@ -245,7 +245,7 @@ do_install() {
     fi
 
     # create bee-filename
-    BEE="$(beeversion ${pkg} --format="%F").bee"
+    BEE="$(@BINDIR@/beeversion ${pkg} --format="%F").bee"
 
     taraction="-x"
 

diff --git a/src/bee-list.sh.in b/src/bee-list.sh.in
@@ -180,8 +180,8 @@ if [ "${OPT_EXACT}" = "yes" ] ; then
     fi
 
     for p in $(list_beepackages "${filter}" ${1}) ; do
-        pname=$(beeversion --pkgfullname "${p}")
-        pfull=$(beeversion --pkgfullpkg  "${p}")
+        pname=$(@BINDIR@/beeversion --pkgfullname "${p}")
+        pfull=$(@BINDIR@/beeversion --pkgfullpkg  "${p}")
         if [ "${1}" = "${pname}"  ] ; then
             echo "${p}"
         fi

diff --git a/src/bee-query.sh.in b/src/bee-query.sh.in
@@ -46,7 +46,7 @@ query() {
         # otherwise list pkg
         base=$(basename $f)
         if [ -d "${BEE_METADIR}/${base}" ] ; then
-            eval $(beeversion $base)
+            eval $(@BINDIR@/beeversion $base)
             get_files "${PKGALLPKG}"
         else
             get_pkgs ${f}

diff --git a/src/bee-remove.sh.in b/src/bee-remove.sh.in
@@ -37,7 +37,7 @@ pkg_remove() {
 do_remove() {
     pkg=$1
 
-    FILES=$(beefind.pl --dump ${pkg}/FILES)
+    FILES=$(@BINDIR@/beefind.pl --dump ${pkg}/FILES)
 
     # removing files
     for f in $FILES ; do

diff --git a/src/beesh.sh.in b/src/beesh.sh.in
@@ -312,7 +312,7 @@ function bee_install() {
 # $BEE_SKIPLIST is found in $BEEFAULTS
 function bee_pkg_pack() {
 
-    aex=$(beecut -d '/' -p '^' -a '$' -n ${BEE_AUTO_EXCLUDE} | sort -u)
+    aex=$(@BINDIR@/beecut -d '/' -p '^' -a '$' -n ${BEE_AUTO_EXCLUDE} | sort -u)
 
     for e in ${EXCLUDE} ${aex} ; do
         exargs="${exargs} --exclude=${e}";
@@ -552,7 +552,7 @@ if [ ! -f ${BEE} ] ; then
 fi
 
 ### define pkg variables
-eval $(beeversion ${BEE})
+eval $(@BINDIR@/beeversion ${BEE})
 
 PN=${PKGNAME}
 PV=( ${PKGVERSION[@]} )