abuild: fixes for new install scripts

Makefile

@@ -2,7 +2,8 @@
 PACKAGE=abuild
 VERSION:=$(shell  awk -F= '$$1 == "abuild_ver" {print $$2}' abuild)
 USR_BIN_FILES=abuild devbuild mkalpine buildrepo
-SAMPLES=sample.APKBUILD sample.initd sample.confd sample.install
+SAMPLES=sample.APKBUILD sample.initd sample.confd sample.pre-install \
+	sample.post-install
 DISTFILES=$(USR_BIN_FILES) $(SAMPLES) Makefile abuild.conf \
 
 

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
 		

sample.install

@@ -1,30 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	pre_install)
-	# add something which happends before install
-	# $2 contains package version
-	;;
-	post_install)
-	# add something which happends after install
-	# $2 contains package version
-	;;
-	pre_upgrade)
-	# add something which happends before update
-	# $2 contains new package version
-	# $3 contains old package version
-	;;
-	post_upgrade)
-	# add something which happends after update
-	# $2 contains new package version
-	# $3 contains old package version
-	;;
-	pre_deinstall)
-	# add something which happends before delete
-	# $2 contains package version
-	;;
-	post_deinstall)
-	# add something which happends after delete
-	# $2 contains package version
-	;;
-esac

sample.post-install

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# add something which happends after install
+

sample.pre-install

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# add something which happends before install
+