From d55b64d504ffe62dc41c2c369e484ddf099289d3 Mon Sep 17 00:00:00 2001
From: Aster Boese <asterboese@mailbox.org>
Date: Tue, 1 Sep 2026 11:58:38 -0400
Subject: [PATCH] main/postmarketos-base: fix post-upgrade shellcheck warnings

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>
---
 main/postmarketos-base/APKBUILD                       | 2 +-
 main/postmarketos-base/postmarketos-base.post-upgrade | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD
index d200e1c31..cb69ab6cf 100644
--- a/main/postmarketos-base/APKBUILD
+++ b/main/postmarketos-base/APKBUILD
@@ -1,7 +1,7 @@
 # Co-Maintainer: Achill Gilgenast <achill@achill.org>
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=postmarketos-base
-pkgver=68
+pkgver=69
 pkgrel=0
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://postmarketos.org"
diff --git a/main/postmarketos-base/postmarketos-base.post-upgrade b/main/postmarketos-base/postmarketos-base.post-upgrade
index cadd39ae3..e05bb6c8b 100644
--- a/main/postmarketos-base/postmarketos-base.post-upgrade
+++ b/main/postmarketos-base/postmarketos-base.post-upgrade
@@ -9,9 +9,9 @@ if mount | grep "on /lib" ; then
     exit 0
 fi
 
-if [ -d /bin -a ! -L /bin ] || \
-       [ -d /sbin -a ! -L /sbin ] || \
-       [ -d /lib -a ! -L /lib ]; then
+if [ -d /bin ] && [ ! -L /bin ] || \
+       [ -d /sbin ] && [ ! -L /sbin ] || \
+       [ -d /lib ] && [ ! -L /lib ]; then
     echo "INFO: /usr merge dryrun to check for errors"
     if merge-usr --dryrun ; then
         echo "INFO: Doing the /usr merge"