main/freeradius: cleanup. replace exit 1 with return 1

so abuild gets a chance to clean up on build failures

1 files changed, 43 insertions, 30 deletions

diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index 64228f7a42..6ffa186f92 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -42,7 +42,8 @@ prepare() {
 	sed -i 's/nsl, //g' configure.in || return 1
 
 	# Fix compilation with heimdal >= 1.3.1
-	sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in || return 1
+	sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in \
+		|| return 1
 
 	# Fix default config
 	sed -i 's%run_dir = .*%run_dir = \$\{localstatedir\}/run/radius%' \
@@ -100,106 +101,117 @@ package() {
 	install -d -m0750 -o radius -g radius "$pkgdir"/var/log/radius/radacct
 
 	make -j1 R="$pkgdir" LIBTOOL="$PWD/libtool" install
-	#sed -i -e 's:^#user *= *radius:user = radiusd:;s:^#group *= *radius:group = radiusd:' \
-	#	"$pkgdir"/etc/raddb/radiusd.conf || exit 1
 	chown -R root:radius "$pkgdir"/etc/raddb/*
 	rm -f "$pkgdir/usr/sbin/rc.radiusd"
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/radiusd
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/radiusd
-	install -m644 -D scripts/logrotate.freeradius "$pkgdir"/etc/logrotate.d/$pkgname
+	install -m644 -D scripts/logrotate.freeradius \
+		"$pkgdir"/etc/logrotate.d/$pkgname
 	find $pkgdir -iname *.la -delete
 }
 
 ldap() {
 	depends="freeradius"
 	mkdir -p $subpkgdir/etc/raddb
-	mv $pkgdir/etc/raddb/ldap.attrmap $subpkgdir/etc/raddb || exit 1
+	mv $pkgdir/etc/raddb/ldap.attrmap $subpkgdir/etc/raddb || return 1
 	mkdir -p $subpkgdir/etc/raddb/modules
-	mv $pkgdir/etc/raddb/modules/ldap $subpkgdir/etc/raddb/modules || exit 1
+	mv $pkgdir/etc/raddb/modules/ldap $subpkgdir/etc/raddb/modules \
+		|| return 1
 	mkdir -p $subpkgdir/usr/lib/freeradius
-	mv $pkgdir/usr/lib/freeradius/rlm_ldap* $subpkgdir/usr/lib/freeradius || exit 1
+	mv $pkgdir/usr/lib/freeradius/rlm_ldap* $subpkgdir/usr/lib/freeradius \
+		|| return 1
 }
 
 lib() {
 	replaces="freeradius"
 	depends=""
 	mkdir -p $subpkgdir/usr/lib/freeradius $subpkgdir/etc/raddb \
-	 $subpkgdir/usr/share || exit 1
+	 $subpkgdir/usr/share || return 1
 	mv $pkgdir/usr/lib/freeradius/libfreeradius-*.so \
-	 $subpkgdir/usr/lib/freeradius || exit 1
-	mv $pkgdir/etc/raddb/dictionary $subpkgdir/etc/raddb/dictionary || exit 1
-	mv $pkgdir/usr/share/freeradius $subpkgdir/usr/share/freeradius || exit 1
+	 $subpkgdir/usr/lib/freeradius || return 1
+	mv $pkgdir/etc/raddb/dictionary $subpkgdir/etc/raddb/dictionary \
+		|| return 1
+	mv $pkgdir/usr/share/freeradius $subpkgdir/usr/share/freeradius \
+		|| return 1
 }
 
 mysql() {
 	depends="freeradius"
 	mkdir -p $subpkgdir/etc/raddb/sql
-	mv $pkgdir/etc/raddb/sql/mysql $subpkgdir/etc/raddb/sql || exit 1
-	mv $pkgdir/etc/raddb/sql/ndb $subpkgdir/etc/raddb/sql || exit 1
+	mv $pkgdir/etc/raddb/sql/mysql $subpkgdir/etc/raddb/sql || return 1
+	mv $pkgdir/etc/raddb/sql/ndb $subpkgdir/etc/raddb/sql || return 1
 	mkdir -p $subpkgdir/usr/lib/freeradius
-	mv $pkgdir/usr/lib/freeradius/rlm_sql_mysql* $subpkgdir/usr/lib/freeradius || exit 1
+	mv $pkgdir/usr/lib/freeradius/rlm_sql_mysql* \
+		$subpkgdir/usr/lib/freeradius || return 1
 }
 
 mssql() {
 	depends="freeradius"
 	arch="noarch"
 	mkdir -p $subpkgdir/etc/raddb/sql
-	mv $pkgdir/etc/raddb/sql/mssql $subpkgdir/etc/raddb/sql || exit 1
+	mv $pkgdir/etc/raddb/sql/mssql $subpkgdir/etc/raddb/sql || return 1
 }
 
 oracle() {
 	depends="freeradius"
 	arch="noarch"
 	mkdir -p $subpkgdir/etc/raddb/sql
-	mv $pkgdir/etc/raddb/sql/oracle $subpkgdir/etc/raddb/sql || exit 1
+	mv $pkgdir/etc/raddb/sql/oracle $subpkgdir/etc/raddb/sql || return 1
 }
 
 perl() {
 	depends="freeradius perl"
 	mkdir -p $subpkgdir/usr/lib/freeradius
-	mv $pkgdir/usr/lib/freeradius/rlm_perl* $subpkgdir/usr/lib/freeradius || exit 1
+	mv $pkgdir/usr/lib/freeradius/rlm_perl* $subpkgdir/usr/lib/freeradius \
+		|| return 1
 	mkdir -p $subpkgdir/usr/bin
-	mv $pkgdir/usr/sbin/checkrad $subpkgdir/usr/bin/checkrad || exit 1
+	mv $pkgdir/usr/sbin/checkrad $subpkgdir/usr/bin/checkrad || return 1
 	mkdir -p $subpkgdir/etc/raddb/modules
-	mv $pkgdir/etc/raddb/modules/perl $subpkgdir/etc/raddb/modules/perl || exit 1
+	mv $pkgdir/etc/raddb/modules/perl $subpkgdir/etc/raddb/modules/perl \
+		|| return 1
 }
 
 postgresql() {
 	depends="freeradius"
 	mkdir -p $subpkgdir/etc/raddb/sql
-	mv $pkgdir/etc/raddb/sql/postgresql $subpkgdir/etc/raddb/sql || exit 1
+	mv $pkgdir/etc/raddb/sql/postgresql $subpkgdir/etc/raddb/sql || return 1
 	mkdir -p $subpkgdir/usr/lib/freeradius
-	mv $pkgdir/usr/lib/freeradius/rlm_sql_postgresql* $subpkgdir/usr/lib/freeradius || exit 1
+	mv $pkgdir/usr/lib/freeradius/rlm_sql_postgresql* \
+		$subpkgdir/usr/lib/freeradius || return 1
 }
 
 python() {
 	depends="freeradius python"
 	mkdir -p $subpkgdir/usr/lib/freeradius
-	mv $pkgdir/usr/lib/freeradius/rlm_python* $subpkgdir/usr/lib/freeradius || exit 1
+	mv $pkgdir/usr/lib/freeradius/rlm_python* \
+		$subpkgdir/usr/lib/freeradius || return 1
 }
 
 radclient() {
 	depends=""
 	mkdir -p $subpkgdir/usr/bin
-	mv $pkgdir/usr/bin/radclient $subpkgdir/usr/bin/radclient || exit 1
+	mv $pkgdir/usr/bin/radclient $subpkgdir/usr/bin/radclient || return 1
 }
 
 sqlite() {
 	depends="freeradius"
 	mkdir -p $subpkgdir/usr/lib/freeradius
-	mv $pkgdir/usr/lib/freeradius/rlm_sql_sqlite* $subpkgdir/usr/lib/freeradius || exit 1
+	mv $pkgdir/usr/lib/freeradius/rlm_sql_sqlite* \
+		$subpkgdir/usr/lib/freeradius || return 1
 }
 
 unixodbc() {
 	depends="freeradius"
 	mkdir -p $subpkgdir/usr/lib/freeradius
-	mv $pkgdir/usr/lib/freeradius/rlm_sql_unixodbc* $subpkgdir/usr/lib/freeradius || exit 1
+	mv $pkgdir/usr/lib/freeradius/rlm_sql_unixodbc* \
+		$subpkgdir/usr/lib/freeradius || return 1
 }
 
 pam() {
 	depends="freeradius"
 	mkdir -p $subpkgdir/usr/lib/freeradius
-	mv $pkgdir/usr/lib/freeradius/rlm_pam* $subpkgdir/usr/lib/freeradius || exit 1
+	mv $pkgdir/usr/lib/freeradius/rlm_pam* $subpkgdir/usr/lib/freeradius \
+		|| return 1
 }
 
 webif() {
@@ -212,14 +224,15 @@ webif() {
 	for dir in bin htdocs html lib sql;
 	do
 		mv $_builddir/dialup_admin/$dir \
-		 $subpkgdir/usr/share/webapps/dialupadmin || exit 1
+		 $subpkgdir/usr/share/webapps/dialupadmin || return 1
 	done
 	mkdir -p $subpkgdir-doc/usr/share/doc/freeradius/dialupadmin
 	mv $_builddir/dialup_admin/doc/* \
-	 $subpkgdir-doc/usr/share/doc/freeradius/dialupadmin || exit 1
+	 $subpkgdir-doc/usr/share/doc/freeradius/dialupadmin || return 1
 	mv $_builddir/dialup_admin/README \
-	 $subpkgdir-doc/usr/share/doc/freeradius/dialupadmin || exit 1
-	mv $_builddir/dialup_admin/conf/* $subpkgdir/etc/raddb/dialupadmin || exit 1
+	 $subpkgdir-doc/usr/share/doc/freeradius/dialupadmin || return 1
+	mv $_builddir/dialup_admin/conf/* $subpkgdir/etc/raddb/dialupadmin \
+		|| return 1
 	for file in $(ls $subpkgdir/usr/share/webapps/dialupadmin/bin)
 	do
 		sed -i "s|/usr/local/dialup_admin/conf|/etc/raddb/dialupadmin|g" \