From 808f16d655e2fde21769693b378f56dda2aef4f8 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Fri, 19 Jan 2007 20:10:13 +0000 Subject: [PATCH] Fix ecompressdir looking into prefix, and use prefix shells/tools in shebangs. svn path=/main/branches/prefix/; revision=5729 --- bin/check-implicit-pointer-usage.py | 2 +- bin/ecompress | 4 ++-- bin/ecompressdir | 10 +++++----- bin/find-requires | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/check-implicit-pointer-usage.py b/bin/check-implicit-pointer-usage.py index 4afa8f24b..27faf4bca 100755 --- 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 91172177e..81451c9c8 100755 --- 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 5d8c53581..ec1ca1602 100755 --- 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 8399326da..9d0365085 100755 --- 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 $ -- 2.26.2