Fix ecompressdir looking into prefix, and use prefix shells/tools in

shebangs.

svn path=/main/branches/prefix/; revision=5729

diff --git a/bin/check-implicit-pointer-usage.py b/bin/check-implicit-pointer-usage.py
index 4afa8f24bc35f429a9dc89f565791ff0b2319820..27faf4bca32cae156d52eac51cab5b571eabdc1a 100755 (executable)
--- a/bin/check-implicit-pointer-usage.py
+++ b/bin/check-implicit-pointer-usage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@PYTHON@ -O
 
 # Ripped from HP and updated from Debian
 

diff --git a/bin/ecompress b/bin/ecompress
index 91172177e03da3e330938f93be9f4f24a86ea450..81451c9c821cc950374d5d3c13f6fd4edd388332 100755 (executable)
--- a/bin/ecompress
+++ b/bin/ecompress
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id: prepman 5507 2007-01-10 04:22:27Z zmedico $
@@ -8,7 +8,7 @@ if [[ -z $1 ]] ; then
        exit 1
 fi
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
 
 # setup compression stuff
 PORTAGE_COMPRESS=${PORTAGE_COMPRESS:-bzip2}

diff --git a/bin/ecompressdir b/bin/ecompressdir
index 5d8c535814aa1a5d08c7be7505929b6785bc8eed..ec1ca1602e233bc958e2d442d1256e984b5d7f1d 100755 (executable)
--- a/bin/ecompressdir
+++ b/bin/ecompressdir
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@BASH@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id: prepalldocs 3483 2006-06-10 21:40:40Z genone $
@@ -15,17 +15,17 @@ if [[ -z ${suffix} ]] ; then
        exit 1
 fi
 
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
 
 ret=0
 
 for dir in "$@" ; do
-       dir="${D}${dir}"
+       dir="${ED}${dir}"
        if [[ ! -d ${dir} ]] ; then
-               vecho "${0##*/}: ${dir#${D}} does not exist!"
+               vecho "${0##*/}: ${dir#${ED}} does not exist!"
                continue
        else
-               vecho "${0##*/}: $(ecompress --bin) ${dir#${D}}"
+               vecho "${0##*/}: $(ecompress --bin) ${dir#${ED}}"
        fi
 
        find "${dir}" -type f '!' -name '*'${suffix} -print0 | xargs -0 ecompress

diff --git a/bin/find-requires b/bin/find-requires
index 8399326daf63239f339a2c4abe663716578e8efb..9d036508500a8854b1b2566dfa5aae49ef7c97b8 100755 (executable)
--- a/bin/find-requires
+++ b/bin/find-requires
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BASH@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/find-requires,v 1.5 2004/10/04 13:56:50 vapier Exp $