Merge branch 'bashisms' into 'master'

Purge bashisms, adduser, and addgroup from packages.git

See merge request adelie/packages!293

experimental/cython/APKBUILD

@@ -2,6 +2,8 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=cython
 _pkgname=Cython
+_p="${_pkgname#?}"
+_p="${_pkgname%"$_p"}"
 pkgver=0.29.12
 pkgrel=0
 pkgdesc="C extension compiler for Python"
@@ -11,7 +13,7 @@ license="Apache-2.0"
 depends=""
 makedepends="python3-dev"
 subpackages=""
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {

experimental/firefox-esr/APKBUILD

@@ -82,7 +82,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 32 ]; then
+	if [ -z "$JOBS" ] || [ $JOBS -gt 32 ]; then
 		echo "mk_add_options MOZ_MAKE_FLAGS=\"-j32\"" >> "$builddir"/mozconfig
 	fi
 }
@@ -117,7 +117,7 @@ package() {
 
 	local png
 	for png in browser/branding/official/default*.png; do
-		local i=${_png%.png}
+		local i="${_png%.png}"
 		i=${i##*/default}
 		install -D -m644 "$png" \
 			"$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png

experimental/firefox/APKBUILD

@@ -59,7 +59,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
 }
@@ -100,7 +100,7 @@ package() {
 
 	local png
 	for png in browser/branding/official/default*.png; do
-		local i=${_png%.png}
+		local i="${_png%.png}"
 		i=${i##*/default}
 		install -D -m644 "$png" \
 			"$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png

experimental/lmms/APKBUILD

@@ -2,6 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=lmms
 pkgver=1.2.0
+_pkgver=$(printf '%s' "$pkgver" | sed 's/_/-/')
 pkgrel=0
 pkgdesc="Music production software"
 url="https://lmms.io/"
@@ -13,13 +14,13 @@ makedepends="alsa-lib-dev cmake fftw-dev fltk-dev fluidsynth-dev lame-dev
 	pulseaudio-dev qt5-qtbase-dev qt5-qttools-dev qt5-qtx11extras-dev
 	sdl-dev extra-cmake-modules xcb-util-dev xcb-util-keysyms-dev"
 subpackages="$pkgname-dev $pkgname-doc"
-source="lmms-${pkgver/_/-}.tar.gz::https://github.com/LMMS/lmms/archive/v${pkgver/_/-}.tar.gz
+source="lmms-$_pkgver.tar.gz::https://github.com/LMMS/lmms/archive/v$_pkgver.tar.gz
 	https://distfiles.adelielinux.org/source/qt5-x11embed-20171106.tar.xz
 	rpmalloc-1.3.1.tar.gz::https://github.com/rampantpixels/rpmalloc/archive/1.3.1.tar.gz
 	thread.patch
 	use-system-ecm.patch
 	"
-builddir="$srcdir"/lmms-${pkgver/_/-}
+builddir="$srcdir/lmms-$_pkgver"
 
 prepare() {
 	cd "$builddir"

experimental/py3-hbmqtt/APKBUILD

@@ -2,7 +2,9 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=py3-hbmqtt
 _pkgname=${pkgname#py3-}
-pkgver=0.9.5	
+_p="${_pkgname#?}"
+_p="${_pkgname%"$_p"}"
+pkgver=0.9.5
 pkgrel=0
 pkgdesc="MQTT client/broker using Python and asyncio"
 url="https://pypi.org/project/hbmqtt/"
@@ -12,7 +14,7 @@ depends="python3"
 checkdepends="py3-docopt py3-passlib py3-pyyaml py3-six py3-transitions py3-websockets"
 makedepends="python3-dev"
 subpackages=""
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {

experimental/qt5-qtwebkit/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=qt5-qtwebkit
 _realname=qtwebkit
 pkgver=5.212.0_alpha2
-_realver=${pkgver/_/-}
+_realver=$(printf '%s' "$pkgver" | sed 's/_/-/')
 pkgrel=0
 pkgdesc="Open source Web browser engine"
 url="https://github.com/annulen/webkit"
@@ -72,7 +72,7 @@ build() {
 		-DUSE_SYSTEM_MALLOC=ON \
 		${CMAKE_CROSSOPTS}
 	# too memory hungry
-	if [ -z "$JOBS" -o $JOBS -gt 32 ]; then
+	if [ -z "$JOBS" ] || [ $JOBS -gt 32 ]; then
 		make -j32
 	else
 		make

experimental/thunderbird/APKBUILD

@@ -78,7 +78,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 32 ]; then
+	if [ -z "$JOBS" ] || [ $JOBS -gt 32 ]; then
 		echo "mk_add_options MOZ_MAKE_FLAGS=\"-j32\"" >> "$builddir"/mozconfig
 	fi
 }

system/abuild/APKBUILD

 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=abuild
 pkgver=3.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Script to build APK packages"
 url="https://code.foxkit.us/adelie/abuild"
 arch="all"

system/abuild/abuild.pre-install

 #!/bin/sh
 
-addgroup -S abuild 2>/dev/null
+groupadd -r abuild 2>/dev/null
 
 exit 0

system/apk-tools/APKBUILD

@@ -56,16 +56,16 @@ static() {
 
 	# lets sign the static binary so it can be vefified from distros
 	# that does not have apk-tools
-	local abuild_conf=${ABUILD_CONF:-"/etc/abuild.conf"}
-	local abuild_home=${ABUILD_USERDIR:-"$HOME/.abuild"}
-	local abuild_userconf=${ABUILD_USERCONF:-"$abuild_home/abuild.conf"}
+	local abuild_conf="${ABUILD_CONF:-"/etc/abuild.conf"}"
+	local abuild_home="${ABUILD_USERDIR:-"$HOME/.abuild"}"
+	local abuild_userconf="${ABUILD_USERCONF:-"$abuild_home/abuild.conf"}"
 	[ -f "$abuild_userconf" ] && . "$abuild_userconf"
 	local privkey="$PACKAGER_PRIVKEY"
-	local pubkey=${PACKAGER_PUBKEY:-"${privkey}.pub"}
-	local keyname=${pubkey##*/}
+	local pubkey="${PACKAGER_PUBKEY:-"${privkey}.pub"}"
+	local keyname="${pubkey##*/}"
 	${CROSS_COMPILE}strip "$subpkgdir"/sbin/apk.static
 	openssl dgst -sha1 -sign "$privkey" \
-		-out "$subpkgdir"/sbin/apk.static.SIGN.RSA.$keyname \
+		-out "$subpkgdir/sbin/apk.static.SIGN.RSA.$keyname" \
 		"$subpkgdir"/sbin/apk.static
 }
 

system/at/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=at
 pkgver=3.1.23
-pkgrel=1
+pkgrel=2
 pkgdesc="Delayed job execution and batch processing daemon"
 url="https://packages.qa.debian.org/a/at.html"
 arch="all"

system/at/at.pre-install

 #!/bin/sh
 
-addgroup -S at 2>/dev/null
-adduser -S -D -H -s /bin/false -G at -g at at 2>/dev/null
+groupadd -r at 2>/dev/null
+useradd -c at -s /sbin/nologin -g at -r at 2>/dev/null
 
 exit 0

system/bash/APKBUILD

@@ -5,7 +5,7 @@ pkgname=bash
 pkgver=4.4.23
 _patchlevel=${pkgver##*.}
 _myver=${pkgver%.*}
-_patchbase=${_myver/./}
+_patchbase=$(printf '%s' "$_myver" | tr -d .)
 pkgrel=1
 pkgdesc="The GNU Bourne Again shell"
 url="https://www.gnu.org/software/bash/bash.html"

system/bc/APKBUILD

@@ -10,8 +10,7 @@ license="BSD-2-Clause"
 depends=""
 makedepends=""
 subpackages="$pkgname-doc"
-source="https://github.com/gavinhoward/bc/releases/download/${pkgver/_/-}/bc-${pkgver/_/-}.tar.xz"
-builddir="$srcdir"/$pkgname-${pkgver/_/-}
+source="https://github.com/gavinhoward/bc/releases/download/$pkgver/bc-$pkgver.tar.xz"
 
 build() {
 	PREFIX="/usr" DESTDIR="$pkgdir" ./configure.sh -g -G -O3

system/ca-certificates/APKBUILD

 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ca-certificates
 pkgver=20190131
-pkgrel=0
+pkgrel=1
 pkgdesc="CA root certificates"
 url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/"
 arch="all"

system/ca-certificates/ca-certificates.trigger

 #!/bin/sh
-/usr/sbin/update-ca-certificates --fresh  &> /dev/null
+/usr/sbin/update-ca-certificates --fresh >/dev/null 2>&1
 exit 0

system/coreutils/APKBUILD

@@ -9,10 +9,10 @@ url="https://www.gnu.org/software/coreutils/"
 arch="all"
 license="GPL-3.0+"
 makedepends="bash acl-dev attr-dev"
-[ ${CBUILD} == ${CHOST} ] && makedepends="$makedepends perl gettext-tiny
+[ "${CBUILD}" = "${CHOST}" ] && makedepends="$makedepends perl gettext-tiny
 						gettext-tiny-dev utmps-dev"
 subpackages="$pkgname-doc"
-[ ${CBUILD} == ${CHOST} ] && subpackages="$subpackages $pkgname-lang"
+[ "${CBUILD}" = "${CHOST}" ] && subpackages="$subpackages $pkgname-lang"
 install="$pkgname.post-deinstall"
 source="https://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz
 	date-debug.patch
@@ -22,7 +22,7 @@ source="https://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz
 	gnulib-test-fixes.patch
 	localename-test-fix.patch
 	"
-[ ${CBUILD} != ${CHOST} ] && source="$source
+[ "${CBUILD}" != "${CHOST}" ] && source="$source
 	051_all_coreutils-mangen.patch
 	"
 
@@ -43,9 +43,10 @@ build() {
 		--with-packager="Adélie" \
 		--with-packager-bug-reports="https://bts.adelielinux.org/"
 
-	if [ ${CBUILD} != ${CHOST} ]; then
-		set -- man/*.x
-		touch ${@/%x/1}
+	if [ "${CBUILD}" != "${CHOST}" ]; then
+		for i in man/*.x; do
+			touch "${i%x}1"
+		done
 	fi
 	make
 }
@@ -70,7 +71,7 @@ bd8b5cecba59eba30458c8afa895877d39a987b989bc06b70cd6836e0ef684677aaadcb4949b58a7
 fd97fccd661befc558b3afb3e32c82dd2cef511a05e6129d49540599297c1b59ab1f109e63a12f585a2348c26c28fb98330c348829d1fe61cf8149d0dd1c989c  gnulib-tests-dont-require-gpg-passphrase.patch
 a1d014a683fb3b2e08e7392f7589fd92a565e2a4d0cac1cf960968dd3d990e020fdd3bb6aea2bbeaca3ba8f2522b4da3d75b93f414ebf83d8b26b5ccbb38a64d  gnulib-test-fixes.patch
 aac3a89b27a7854fbf483e155df9133c3d33a0f36bd55d5606559a7781f9d27d5c17779ea427142311749252767097bf92ec22d4cf86b510568c186da84ff16c  date-debug.patch"
-[ ${CBUILD} != ${CHOST} ] && sha512sums="
+[ "${CBUILD}" != "${CHOST}" ] && sha512sums="
 bae804f057252c25452ac178c545dc2c4b4775cbfbdcfd4775edd1a4ed6507882bfac39e2b11ad01b74230ca48d761bf62f11bde5bcbc35a6e5a61cbe4a46e36  051_all_coreutils-mangen.patch
 "
 return 0

system/fcron/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=fcron
 pkgver=3.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="periodical command scheduler for systems not always up"
 url="http://fcron.free.fr/"
 pkgusers="fcron"

system/fcron/fcron.pre-install

 #!/bin/sh
 
-adduser -S -D -H -s /sbin/nologin -g fcron fcron 2>/dev/null
-addgroup -S fcron 2>/dev/null
+groupadd -r fcron 2>/dev/null
+useradd -c fcron -s /sbin/nologin -g fcron -r fcron 2>/dev/null
 
 exit 0

system/gcc/APKBUILD

@@ -343,7 +343,7 @@ package() {
 	rm -f "$pkgdir"/usr/lib/libffi* "$pkgdir"/usr/share/man/man3/ffi*
 	find "$pkgdir" -name 'ffi*.h' | xargs rm -f
 
-	local gdblib=${_target:+$CTARGET/}lib
+	local gdblib="${_target:+$CTARGET/}lib"
 	for i in $(find "$pkgdir"/usr/$gdblib/ -type f -maxdepth 1 -name "*-gdb.py" ); do
 		mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib
 		mv "$i" "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib/
@@ -368,7 +368,7 @@ package() {
 		# linker finds the libs from relocated sysroot
 		for so in "$pkgdir"/usr/$CTARGET/lib/*.so; do
 			if [ -h "$so" ]; then
-				local _real=$(basename $(readlink "$so"))
+				local _real="$(basename $(readlink "$so"))"
 				rm -f "$so"
 				echo "GROUP ($_real)" > "$so"
 			fi