oneechanhax/abuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

abuild: prepare_metafiles: use new /bin/sh virtual instead of hardcoded busybox dependency

Browse Source
This commit is contained in:
William Pitcock 2017-08-05 22:03:13 +00:00
parent a74359e8e2
commit eb0a7d0811
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
abuild.in
View File

@ -894,13 +894,13 @@ prepare_metafiles() {
EOF EOF
local i deps local i deps
deps="$depends" deps="$depends"
if [ "$pkgname" != "busybox" ] && ! depends_has busybox; then if [ "$pkgname" != "busybox" ] && ! depends_has busybox && ! depends_has /bin/sh; then
for i in $install $triggers; do for i in $install $triggers; do
local s=${i%=*} local s=${i%=*}
[ "$name" != "${s%.*}" ] && continue [ "$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. /bin/sh added as a dependency for $pkg"
deps="$deps busybox" deps="$deps /bin/sh"
break break
fi fi
done done