summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2017-08-05 22:03:13 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2017-08-05 22:03:13 +0000
commiteb0a7d081131a287983753d89933c499fc1864c8 (patch)
tree1052a9da9458fb483ae48889e2852bc9965de687
parenta74359e8e20815b4b502524d944b67ac3dbaabd6 (diff)
downloadabuild-eb0a7d081131a287983753d89933c499fc1864c8.tar.gz
abuild-eb0a7d081131a287983753d89933c499fc1864c8.tar.bz2
abuild-eb0a7d081131a287983753d89933c499fc1864c8.tar.xz
abuild-eb0a7d081131a287983753d89933c499fc1864c8.zip
abuild: prepare_metafiles: use new /bin/sh virtual instead of hardcoded busybox dependency
-rw-r--r--abuild.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/abuild.in b/abuild.in
index f3583a2..595f09b 100644
--- a/abuild.in
+++ b/abuild.in
@@ -894,13 +894,13 @@ prepare_metafiles() {
EOF
local i deps
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
local s=${i%=*}
[ "$name" != "${s%.*}" ] && continue
if head -n 1 "$startdir/$s" | grep '^#!/bin/sh' >/dev/null ; then
- msg "Script found. busybox added as a dependency for $pkg"
- deps="$deps busybox"
+ msg "Script found. /bin/sh added as a dependency for $pkg"
+ deps="$deps /bin/sh"
break
fi
done