diff options
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 50222eb6e..ff0dd78c4 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -313,15 +313,16 @@ unpack() { y=${x%.*} y=${y##*.} - myfail="${x} does not exist" - if [ "${x:0:2}" = "./" ] ; then + if [[ ${x} == "./"* ]] ; then srcdir="" + elif [[ ${x} == ${DISTDIR%/}/* ]] ; then + die "Arguments to unpack() cannot begin with \${DISTDIR}." + elif [[ ${x} == "/"* ]] ; then + die "Arguments to unpack() cannot be absolute" else srcdir="${DISTDIR}/" fi - [[ ${x} == ${DISTDIR}* ]] && \ - die "Arguments to unpack() should not begin with \${DISTDIR}." - [ ! -s "${srcdir}${x}" ] && die "$myfail" + [[ ! -s ${srcdir}${x} ]] && die "${x} does not exist" myfail="failure unpacking ${x}" case "${x##*.}" in |