mirror of
https://gitlab.alpinelinux.org/alpine/abuild.git
synced 2025-01-08 15:50:38 +00:00
abuild: fix bug in install script detection
This commit is contained in:
parent
9947fdfafa
commit
f5a3a48da0
@ -553,6 +553,7 @@ EOF
|
|||||||
if [ "$pkgname" != "busybox" ] && ! depends_has busbox; then
|
if [ "$pkgname" != "busybox" ] && ! depends_has busbox; then
|
||||||
for i in $install $triggers; do
|
for i in $install $triggers; do
|
||||||
local s=${i%=*}
|
local s=${i%=*}
|
||||||
|
[ "$name" != "${s%.*}" ] && continue
|
||||||
if head -n 1 "$startdir/$s" | grep '^#!/bin/sh' >/dev/null ; then
|
if head -n 1 "$startdir/$s" | grep '^#!/bin/sh' >/dev/null ; then
|
||||||
msg "Script found. busybox added as a dependency for $pkg"
|
msg "Script found. busybox added as a dependency for $pkg"
|
||||||
deps="$deps busybox"
|
deps="$deps busybox"
|
||||||
@ -600,7 +601,7 @@ EOF
|
|||||||
for i in $install $triggers; do
|
for i in $install $triggers; do
|
||||||
local f=${i%=*}
|
local f=${i%=*}
|
||||||
local n=${f%.*}
|
local n=${f%.*}
|
||||||
if [ "$n" != "$pkgname" ]; then
|
if [ "$n" != "$name" ]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
script=${f#$name}
|
script=${f#$name}
|
||||||
|
Loading…
Reference in New Issue
Block a user