user/*: bashism removal part 2 (o-z)

16 files changed, 27 insertions, 27 deletions

diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD
index 9d7239c45..cd6e236d8 100644
--- a/user/qemu/APKBUILD
+++ b/user/qemu/APKBUILD
@@ -314,8 +314,8 @@ package() {
 }
 
 _subsys() {
-	local name=${1:-"${subpkgname#$pkgname-}"}
-	pkgdesc="Qemu ${name/-/ } emulator"
+	local name="${1:-"${subpkgname#$pkgname-}"}"
+	pkgdesc="Qemu $(printf '%s' "$name" | tr - ' ') emulator"
 	options=""
 	depends=""
 	case "$name" in
diff --git a/user/qt5-qtdeclarative/APKBUILD b/user/qt5-qtdeclarative/APKBUILD
index 6518c3716..3b9b56a89 100644
--- a/user/qt5-qtdeclarative/APKBUILD
+++ b/user/qt5-qtdeclarative/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtdeclarative
-_pkgname=${pkgname/qt5-/}-opensource-src
+_pkgname=${pkgname#qt5-}-opensource-src
 pkgver=5.9.7
 pkgrel=0
 pkgdesc="Qt 5 - Qt Declarative and Qt Quick 2"
diff --git a/user/qt5-qtpositioning/APKBUILD b/user/qt5-qtpositioning/APKBUILD
index 5bb8daf6f..9f74280ef 100644
--- a/user/qt5-qtpositioning/APKBUILD
+++ b/user/qt5-qtpositioning/APKBUILD
@@ -21,7 +21,7 @@ build() {
 	cd "$builddir"
 	qmake
 	# too memory hungry
-	if [ -z "$JOBS" -o $JOBS -gt 16 ]; then
+	if [ -z "$JOBS" ] || [ $JOBS -gt 16 ]; then
 		make -j16
 	else
 		make
diff --git a/user/quassel/APKBUILD b/user/quassel/APKBUILD
index f9f583de7..a52be97cb 100644
--- a/user/quassel/APKBUILD
+++ b/user/quassel/APKBUILD
@@ -59,7 +59,7 @@ client() {
 	mv "$pkgdir"/usr/bin/quasselclient "$subpkgdir"/usr/bin/
 
 	local dir
-	for dir in {applications,icons,pixmaps,knotifications5}; do
+	for dir in applications icons pixmaps knotifications5; do
 		mkdir -p "$subpkgdir"/usr/share/$dir
 		mv "$pkgdir"/usr/share/$dir "$subpkgdir"/usr/share/
 	done
diff --git a/user/quaternion/APKBUILD b/user/quaternion/APKBUILD
index 76f7284af..a3445fb3d 100644
--- a/user/quaternion/APKBUILD
+++ b/user/quaternion/APKBUILD
@@ -2,6 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=quaternion
 pkgver=0.0.9.4c
+_pkgver=$(printf '%s' "$pkgver" | sed 's/_/-/')
 pkgrel=0
 pkgdesc="Qt5-based Matrix chat client"
 url="https://matrix.org/docs/projects/client/quaternion.html"
@@ -11,8 +12,8 @@ depends="qt5-qtquickcontrols"
 makedepends="cmake libquotient-dev qt5-qtbase-dev qt5-qtdeclarative-dev
 	qt5-qtmultimedia-dev qt5-qttools-dev"
 subpackages=""
-source="quaternion-$pkgver.tar.gz::https://github.com/QMatrixClient/Quaternion/archive/${pkgver/_/-}.tar.gz"
-builddir="$srcdir/Quaternion-${pkgver/_/-}"
+source="quaternion-$pkgver.tar.gz::https://github.com/QMatrixClient/Quaternion/archive/$_pkgver.tar.gz"
+builddir="$srcdir/Quaternion-$_pkgver"
 
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
diff --git a/user/sane/APKBUILD b/user/sane/APKBUILD
index 941402502..a2f2c3a3a 100644
--- a/user/sane/APKBUILD
+++ b/user/sane/APKBUILD
@@ -66,7 +66,7 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	echo -n "" > "$pkgdir"/etc/sane.d/dll.conf
+	printf "" > "$pkgdir"/etc/sane.d/dll.conf
 	install -Dm644 backend/dll.aliases "$pkgdir"/etc/sane.d/dll.aliases
 }
 
@@ -117,7 +117,7 @@ backends() {
 }
 
 _backend() {
-	local name=${subpkgname#$pkgname-backend-}
+	local name="${subpkgname#$pkgname-backend-}"
 	depends="$pkgname"
 	pkgdesc=$(eval echo \$_pkgdesc_$name)
 	if [ ! "$pkgdesc" ]; then
diff --git a/user/serf/APKBUILD b/user/serf/APKBUILD
index db2ae5425..06cc98c2a 100644
--- a/user/serf/APKBUILD
+++ b/user/serf/APKBUILD
@@ -31,7 +31,7 @@ package() {
 	install -D -m755 libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so.1.3.0
 	ln -s libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so.1
 	ln -s libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so
-	for _header in serf{_bucket_{types,util},}.h; do
+	for _header in serf.h serf_bucket_types.h serf_bucket_util.h; do
 		install -D -m644 $_header "$pkgdir"/usr/include/serf-1/$_header
 	done
 	install -D -m644 serf-1.pc "$pkgdir"/usr/lib/pkgconfig/serf-1.pc
diff --git a/user/spectrwm/APKBUILD b/user/spectrwm/APKBUILD
index 4c3de19db..7699adf7d 100644
--- a/user/spectrwm/APKBUILD
+++ b/user/spectrwm/APKBUILD
@@ -2,8 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=spectrwm
 pkgver=3.2.0
-_pkgver=${pkgver/./_}
-_pkgver=${_pkgver/./_}
+_pkgver=$(printf '%s' "$pkgver" | tr . _)
 pkgrel=0
 pkgdesc="Small dynamic tiling window manager"
 url="https://github.com/conformal/spectrwm"
diff --git a/user/strongswan/APKBUILD b/user/strongswan/APKBUILD
index 29390b652..8f2bf88d5 100644
--- a/user/strongswan/APKBUILD
+++ b/user/strongswan/APKBUILD
@@ -3,7 +3,6 @@
 # Maintainer: Lee Starnes <lee@canned-death.us>
 pkgname=strongswan
 pkgver=5.7.1
-_pkgver=${pkgver//_rc/rc}
 pkgrel=0
 pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
 url="https://www.strongswan.org/"
@@ -17,7 +16,7 @@ makedepends="$depends_dev linux-headers python3 sqlite-dev openssl-dev curl-dev
 	gmp-dev libcap-dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-dbg $pkgname-openrc"
-source="https://download.strongswan.org/$pkgname-$_pkgver.tar.bz2
+source="https://download.strongswan.org/$pkgname-$pkgver.tar.bz2
 	0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch
 	1001-charon-add-optional-source-and-remote-overrides-for-.patch
 	1002-vici-send-certificates-for-ike-sa-events.patch
@@ -26,7 +25,6 @@ source="https://download.strongswan.org/$pkgname-$_pkgver.tar.bz2
 	strongswan.initd
 	charon.initd
 	"
-builddir="$srcdir/$pkgname-$_pkgver"
 
 # secfixes:
 #   5.7.1-r0:
diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD
index 9acdee471..5b23efe27 100644
--- a/user/thunderbird/APKBUILD
+++ b/user/thunderbird/APKBUILD
@@ -74,7 +74,7 @@ prepare() {
 	echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig
 	echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig
 	# too much memory
-	if [ -z "$JOBS" -o $JOBS -gt 16 ]; then
+	if [ -z "$JOBS" ] || [ $JOBS -gt 16 ]; then
 		echo "mk_add_options MOZ_MAKE_FLAGS=\"-j16\"" >> "$builddir"/mozconfig
 	fi
 }
diff --git a/user/urw-base35-fonts/APKBUILD b/user/urw-base35-fonts/APKBUILD
index 40b0da945..f15189502 100644
--- a/user/urw-base35-fonts/APKBUILD
+++ b/user/urw-base35-fonts/APKBUILD
@@ -23,11 +23,10 @@ package() {
 	cp -a "$builddir"/fonts/*.t1  "$pkgdir"/usr/share/fonts/urw-base35/
 
 	mkdir -p "$pkgdir"/etc/fonts/conf.d/
-	pushd "$builddir"/fontconfig
+	cd "$builddir"/fontconfig
 	for _fconf in *.conf; do
 		install -m 644 "$_fconf" "$pkgdir"/etc/fonts/conf.d/61-${_fconf}.conf
 	done
-	popd
 }
 
 sha512sums="897fef5968d659ff49dc144f6c94513b32f8d9167c4fabcd7c3b13d2ce4c82d4182b25528291a36158d7a6e1cd864c67d22ce64a2c55dad4e984305f2fd65a91  urw-base35-fonts-20170801.1.tar.gz"
diff --git a/user/w3m/APKBUILD b/user/w3m/APKBUILD
index 134acd67d..45fb1c014 100644
--- a/user/w3m/APKBUILD
+++ b/user/w3m/APKBUILD
@@ -2,6 +2,8 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=w3m
 pkgver=0.5.3_git20190105
+_pkgverp="${pkgver%_*}+${pkgver#*_}"
+_pkgverm="${pkgver%_*}-${pkgver#*_}"
 pkgrel=0
 pkgdesc="Text-based Web browser"
 url="http://w3m.sourceforge.net/"
@@ -12,8 +14,8 @@ depends="compface"
 makedepends="compface-dev gc-dev gdk-pixbuf-dev glib-dev gtk+2.0-dev imlib2-dev
 	libbsd-dev libx11-dev ncurses-dev openssl-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-source="w3m-$pkgver.tar.gz::https://github.com/tats/w3m/archive/v0.5.3+git20190105.tar.gz"
-builddir="$srcdir"/w3m-${pkgver/_/-}
+source="w3m-$pkgver.tar.gz::https://github.com/tats/w3m/archive/v$_pkgverp.tar.gz"
+builddir="$srcdir/$pkgname-$_pkgverm"
 
 build() {
 	cd "$builddir"
diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD
index 5c8d91b84..e5f49da9d 100644
--- a/user/weechat/APKBUILD
+++ b/user/weechat/APKBUILD
@@ -45,7 +45,7 @@ package() {
 }
 
 _plugin() {
-	local _name=${subpkgname#*-}
+	local _name="${subpkgname#*-}"
 	local _dir=usr/lib/weechat/plugins
 	pkgdesc="WeeChat $_name plugin"
 	depends="weechat"
diff --git a/user/wireless-tools/APKBUILD b/user/wireless-tools/APKBUILD
index 0d5cfcf02..8f327a3e9 100644
--- a/user/wireless-tools/APKBUILD
+++ b/user/wireless-tools/APKBUILD
@@ -4,8 +4,8 @@
 # Note: Sorry this is disgusting, I blame the author for archiving it using a silly naming scheme
 pkgname=wireless-tools
 pkgver=30_pre9
-_pkgname=${pkgname/-/_}
-_pkgver=${pkgver/_/.}
+_pkgname=wireless_tools
+_pkgver=$(printf '%s' "$pkgver" | sed 's/_/./')
 _pkgmaj=${pkgver%_pre[0-9]*}
 pkgrel=0
 pkgdesc="Open Source wireless tools"
@@ -16,9 +16,9 @@ license="GPL-2.0-or-later"
 depends=""
 makedepends="linux-headers"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://hewlettpackard.github.io/wireless-tools/wireless_tools.${_pkgver}.tar.gz"
+source="https://hewlettpackard.github.io/wireless-tools/wireless_tools.$_pkgver.tar.gz"
 
-builddir="$srcdir"/"$_pkgname"."$_pkgmaj"
+builddir="$srcdir/$_pkgname.$_pkgmaj"
 
 build() {
 	cd "$builddir"
diff --git a/user/x264/APKBUILD b/user/x264/APKBUILD
index edae76ade..4c8b772a0 100644
--- a/user/x264/APKBUILD
+++ b/user/x264/APKBUILD
@@ -27,7 +27,8 @@ build() {
 	esac
 
 	# note: not autotools
-	CFLAGS="${CFLAGS/-Os/}" ./configure \
+	CFLAGS="$(printf '%s' "$CFLAGS" | sed 's/-Os//')" \
+	./configure \
 		--host=$CHOST \
 		--prefix=/usr \
 		--enable-shared \
diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD
index fc99a9870..2debe9c90 100644
--- a/user/xorg-server/APKBUILD
+++ b/user/xorg-server/APKBUILD
@@ -57,7 +57,7 @@ prepare() {
 
 build() {
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
-	[ "$CLIBC" == musl ] && export CFLAGS="$CFLAGS -D__gid_t=gid_t -D__uid_t=uid_t"
+	[ "$CLIBC" = musl ] && export CFLAGS="$CFLAGS -D__gid_t=gid_t -D__uid_t=uid_t"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 
 	./configure \