snlavaise/pmaports-rtwo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main/postmarketos-base: fix post-upgrade shellcheck warnings

Browse Source 
Fixes 'SC2166 (warning): Prefer [ p ] && [ q ] as [ p -a q ] is not well defined.'

Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/9471>
This commit is contained in:
Aster Boese
2026-09-02 22:31:02 +00:00
committed by The Friendly Meow (merge) Bot
parent 6632bdda09
commit d55b64d504
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/postmarketos-base/APKBUILD
+1 -1
View File
@@ -1,7 +1,7 @@
# Co-Maintainer: Achill Gilgenast <achill@achill.org> # Co-Maintainer: Achill Gilgenast <achill@achill.org>
maintainer="Clayton Craft <clayton@craftyguy.net>" maintainer="Clayton Craft <clayton@craftyguy.net>"
pkgname=postmarketos-base pkgname=postmarketos-base
pkgver=68 pkgver=69
pkgrel=0 pkgrel=0
pkgdesc="Meta package for minimal postmarketOS base" pkgdesc="Meta package for minimal postmarketOS base"
url="https://postmarketos.org" url="https://postmarketos.org"
main/postmarketos-base/postmarketos-base.post-upgrade
+3 -3
View File
@@ -9,9 +9,9 @@ if mount | grep "on /lib" ; then
exit 0 exit 0
fi fi
if [ -d /bin -a ! -L /bin ] || \ if [ -d /bin ] && [ ! -L /bin ] || \
[ -d /sbin -a ! -L /sbin ] || \ [ -d /sbin ] && [ ! -L /sbin ] || \
[ -d /lib -a ! -L /lib ]; then [ -d /lib ] && [ ! -L /lib ]; then
echo "INFO: /usr merge dryrun to check for errors" echo "INFO: /usr merge dryrun to check for errors"
if merge-usr --dryrun ; then if merge-usr --dryrun ; then
echo "INFO: Doing the /usr merge" echo "INFO: Doing the /usr merge"