summaryrefslogtreecommitdiffstats
path: root/abuild
diff options
context:
space:
mode:
Diffstat (limited to 'abuild')
-rwxr-xr-xabuild16
1 files changed, 11 insertions, 5 deletions
diff --git a/abuild b/abuild
index e73e062..7fea685 100755
--- a/abuild
+++ b/abuild
@@ -285,9 +285,14 @@ size = $size
EOF
local i deps
deps="$depends"
- if [ -n "$install" ] && head -n 1 "$srcdir/$install" | grep '^#' >/dev/null && ! depends_has busybox && [ "$pkgname" != "busybox" ]; then
- msg "Adding busybox to depends since we have an install script"
- deps="$deps busybox"
+ if [ "$pkgname" != "busybox" ] && ! depends_has busbox; then
+ for i in $install; do
+ if head -n 1 "$srcdir/$i" | grep '^#!/bin/sh' >/dev/null ; then
+ msg "Script found. busybox added as a dependency for $pkg"
+ deps="$deps busybox"
+ break
+ fi
+ done
fi
for i in $license; do
@@ -672,8 +677,9 @@ newaport() {
if [ -n "$cpinitd" ]; then
cp "$datadir"/sample.initd $pn.initd
cp "$datadir"/sample.confd $pn.confd
- cp "$datadir"/sample.install $pn.install
- sed -i -e "s/^install=.*/install=\"$pn.install\"/" \
+ cp "$datadir"/sample.pre-install $pn.pre-install
+ cp "$datadir"/sample.post-install $pn.post-install
+ sed -i -e "s/^install=.*/install=\"\$pkgname.pre-install \$pkgname.post-install\"/" \
-e "s/^source=\"\(.*\)\"/source=\"\1\n\t$pn.initd\n\t$pn.confd\n\t\$install\n\t\"/" \
APKBUILD