diff options
author | Leonardo Arena <rnalrd@alpinelinux.org> | 2014-07-09 11:03:30 +0000 |
---|---|---|
committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2014-07-09 11:04:06 +0000 |
commit | bb196134705a240c3af4d807b191cb16f54e6dfb (patch) | |
tree | 706cf749f2185a966528c2a1ab3a787457b9bbc3 | |
parent | 3f3f2fdd034dd77d718a212551b3208039961e8a (diff) | |
download | aports-bb196134705a240c3af4d807b191cb16f54e6dfb.tar.bz2 aports-bb196134705a240c3af4d807b191cb16f54e6dfb.tar.xz |
replace exit with return in some packages
-rw-r--r-- | main/open-lldp/APKBUILD | 6 | ||||
-rw-r--r-- | main/owncloud/APKBUILD | 10 | ||||
-rw-r--r-- | main/phpldapadmin/APKBUILD | 4 | ||||
-rw-r--r-- | main/roundcubemail/APKBUILD | 4 | ||||
-rw-r--r-- | main/umurmur/APKBUILD | 8 |
5 files changed, 16 insertions, 16 deletions
diff --git a/main/open-lldp/APKBUILD b/main/open-lldp/APKBUILD index e87fa00be1..670ab588a8 100644 --- a/main/open-lldp/APKBUILD +++ b/main/open-lldp/APKBUILD @@ -20,9 +20,9 @@ _builddir="$srcdir/lldpad-$pkgver" prepare() { cd "$_builddir" - sed -i 's/ln -T -s/ln -s/' Makefile.am || exit 1 - #sed -i 's/ln -T -s/ln -s/' Makefile.in || exit 1 - sed -i -e 's/-Werror//' Makefile.am configure.ac || exit 1 + sed -i 's/ln -T -s/ln -s/' Makefile.am || return 1 + #sed -i 's/ln -T -s/ln -s/' Makefile.in || return 1 + sed -i -e 's/-Werror//' Makefile.am configure.ac || return 1 libtoolize --force && aclocal && autoconf --force && automake --add-missing } diff --git a/main/owncloud/APKBUILD b/main/owncloud/APKBUILD index 91c4fb2ab3..e0aca0132a 100644 --- a/main/owncloud/APKBUILD +++ b/main/owncloud/APKBUILD @@ -49,14 +49,14 @@ package() { mkdir -p "$pkgdir"${_ocwwwdir} rm -rf config data mv * "$pkgdir"${_ocwwwdir} || exit - ln -s $_occonfdir "$pkgdir"${_ocwwwdir}/config || exit 1 + ln -s $_occonfdir "$pkgdir"${_ocwwwdir}/config || return 1 install -m660 ../owncloud.config.php "$pkgdir"${_occonfdir}/config.php for dir in \ "$pkgdir"${_occonfdir} \ "$pkgdir"${_ocdatadir} \ "$pkgdir"${_ocappsdir}; do - chown -R :www-data $dir || exit 1 - chmod 770 $dir || exit 1 + chown -R :www-data $dir || return 1 + chmod 770 $dir || return 1 done } @@ -85,12 +85,12 @@ plugins() { arch="noarch" pkgdesc="ownCloud 3rdparty plugins" depends="owncloud" - mkdir -p "$subpkgdir"${_ocwwwdir} || exit 1 + mkdir -p "$subpkgdir"${_ocwwwdir} || return 1 mv "$pkgdir"${_ocwwwdir}/3rdparty "$subpkgdir"${_ocwwwdir} } _mv_app() { - mkdir -p "$subpkgdir"${_ocappsdir} || exit 1 + mkdir -p "$subpkgdir"${_ocappsdir} || return 1 mv "$pkgdir"${_ocappsdir}/$1 "$subpkgdir"${_ocappsdir} } diff --git a/main/phpldapadmin/APKBUILD b/main/phpldapadmin/APKBUILD index 6439427a94..99ac475fdd 100644 --- a/main/phpldapadmin/APKBUILD +++ b/main/phpldapadmin/APKBUILD @@ -32,9 +32,9 @@ package() { mkdir -p "$pkgdir"/etc mv * "$pkgdir"/usr/share/webapps/phpldapadmin mv "$pkgdir"/usr/share/webapps/phpldapadmin/config "$pkgdir"/etc/phpldapadmin - ln -s /etc/phpldapadmin "$pkgdir"/usr/share/webapps/phpldapadmin/config || exit 1 + ln -s /etc/phpldapadmin "$pkgdir"/usr/share/webapps/phpldapadmin/config || return 1 install -Dm644 ../$pkgname.additional-template \ - "$pkgdir"/usr/share/webapps/phpldapadmin/templates/creation/groupOfNames.xml || exit 1 + "$pkgdir"/usr/share/webapps/phpldapadmin/templates/creation/groupOfNames.xml || return 1 } md5sums="59a49054039ceb852c2da377d8742360 phpldapadmin-1.2.3.tgz diff --git a/main/roundcubemail/APKBUILD b/main/roundcubemail/APKBUILD index d14c49afdc..ce71b8a3a2 100644 --- a/main/roundcubemail/APKBUILD +++ b/main/roundcubemail/APKBUILD @@ -60,10 +60,10 @@ package() { for file in CHANGELOG INSTALL README.md UPGRADING do mv "$pkgdir"/usr/share/webapps/roundcube/$file \ - "$pkgdir"/usr/share/doc/roundcube || exit 1 + "$pkgdir"/usr/share/doc/roundcube || return 1 done mv "$pkgdir"/usr/share/webapps/roundcube/LICENSE \ - "$pkgdir"/usr/share/licenses/roundcube || exit 1 + "$pkgdir"/usr/share/licenses/roundcube || return 1 } installer() { diff --git a/main/umurmur/APKBUILD b/main/umurmur/APKBUILD index 7d4c628c13..06e002a3c1 100644 --- a/main/umurmur/APKBUILD +++ b/main/umurmur/APKBUILD @@ -43,10 +43,10 @@ package() { install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/umurmurd install -m644 -D "$srcdir"/$pkgname.conf "$pkgdir"/etc/umurmur/umurmurd.conf mkdir -p "$pkgdir"/usr/share/doc/umurmur - install -m644 -D "$_builddir"/AUTHORS "$pkgdir"/usr/share/doc/umurmur || exit 1 - install -m644 -D "$_builddir"/ChangeLog "$pkgdir"/usr/share/doc/umurmur || exit 1 - install -m644 -D "$_builddir"/LICENSE "$pkgdir"/usr/share/doc/umurmur || exit 1 - install -m644 -D "$_builddir"/README.md "$pkgdir"/usr/share/doc/umurmur || exit 1 + install -m644 -D "$_builddir"/AUTHORS "$pkgdir"/usr/share/doc/umurmur || return 1 + install -m644 -D "$_builddir"/ChangeLog "$pkgdir"/usr/share/doc/umurmur || return 1 + install -m644 -D "$_builddir"/LICENSE "$pkgdir"/usr/share/doc/umurmur || return 1 + install -m644 -D "$_builddir"/README.md "$pkgdir"/usr/share/doc/umurmur || return 1 mkdir -p "$pkgdir"/var/run/umurmur chown umurmur:umurmur "$pkgdir"/var/run/umurmur } |