Merge branch 'openrc-bashisms' into 'master'

Cleanup OpenRC init.d scripts, and more

See merge request adelie/packages!295

7 files changed, 18 insertions, 17 deletions

diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD
index 73bfea8b5..336d81458 100644
--- a/system/musl/APKBUILD
+++ b/system/musl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=musl
 pkgver=1.1.23
-pkgrel=0
+pkgrel=1
 pkgdesc="System library (libc) implementation"
 url="https://www.musl-libc.org/"
 arch="all"
@@ -123,6 +123,6 @@ ef532aebeaa89b3274f7f75f1adaa4d1eea60f4e2822a6711c748768cc3a65a77ebd218d7a8ab411
 ded41235148930f8cf781538f7d63ecb0c65ea4e8ce792565f3649ee2523592a76b2a166785f0b145fc79f5852fd1fb1729a7a09110b3b8f85cba3912e790807  fgetspent_r.patch
 fda015fad0d0a65efb192c08d201b2f5b2bfff18c43b551855b119a1d63213bd417a93a6b2965e68243884c5b17b34a585795cc4cace603788d37149e933cfb1  powerpc-wchar_t.patch
 7ed6c620a5ea5585c323936b1ff01eb7f01a1192240706a0d0470b661a7a03ea10ed17507c59678aaedce51b7a5ea839c2f528f19f12de02119bf4e47f7c3998  strftime-add-l-support.patch
-cce2f1eeb61e55674469c26871a573cce61d739c3defe9c8f56f2b774f6ba5435849ad542a6714120efddc98c297098e9c98a1a424ac593df2243d4aa479f9a9  ldconfig
+cb71d29a87f334c75ecbc911becde7be825ab30d8f39fa6d64cb53812a7c9abaf91d9804c72540e5be3ddd3c84cfe7fd9632274309005cb8bcdf9a9b09b4b923  ldconfig
 378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413  getent.c
 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf  iconv.c"
diff --git a/system/musl/ldconfig b/system/musl/ldconfig
index 7699c6722..991927bae 100644
--- a/system/musl/ldconfig
+++ b/system/musl/ldconfig
@@ -18,11 +18,11 @@ msg() {
 }
 
 musl_arch() {
-	$ROOT/usr/lib/libc.so |& sed -n 's/^musl libc (\(.*\))$/\1/p'
+	$ROOT/usr/lib/libc.so 2>&1 | sed -n 's/^musl libc (\(.*\))$/\1/p'
 }
 
 musl_version() {
-	$ROOT/usr/lib/libc.so |& sed -n 's/^Version //p'
+	$ROOT/usr/lib/libc.so 2>&1 | sed -n 's/^Version //p'
 }
 
 read_ldso_conf() {
diff --git a/system/openrc/APKBUILD b/system/openrc/APKBUILD
index c59c0b642..6c41d9f99 100644
--- a/system/openrc/APKBUILD
+++ b/system/openrc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: 
 pkgname=openrc
 pkgver=0.24.1
-pkgrel=7
+pkgrel=8
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="https://github.com/OpenRC/openrc"
 arch="all"
@@ -95,6 +95,6 @@ d54630d40a2d6b10a325cb012d4efcda997a60c008ca953ce5d60059d3f267308a59dabddf93a5fc
 99b542c0903ad6874b8c308b2e0660a4fe2ff9db962dfec65325cd12c368873a2ae800d5e6d42dc4deff775e1d5c0068869eb72581f7ab16e88d5738afe1d3dd  hostname.initd
 c06eac7264f6cc6888563feeae5ca745aae538323077903de1b19102e4f16baa34c18b8c27af5dd5423e7670834e2261e9aa55f2b1ec8d8fdc2be105fe894d55  hwdrivers.initd
 b04058ec630e19de0bafefe06198dc1bff8c8d5d2c89e4660dd83dda8bb82a76cdb1d8661cce88e4a406aa6b4152e17efff52d3eb18ffaec0751d0b6cdbcc48a  modules.initd
-92c0245ba4d7cc6828a9b68510fb541cf3b21b9b844a858336af60e84d1db62ddb4471aad0d82ef05d639335a81014f8350a71a746c2bcd90697daa6a8c03408  modloop.initd
+328e1f4cf3d9542ae47a517b900b57f383e0c0e24e24c52437667b72fa11d7986329dac176168ca9b6729cb412286f1ad8327771c85aa821c8b534b1bd860712  modloop.initd
 aa702a7da8e6c0e5d8738febaf6b4e4cb021b30ce5c1809b530abf2b36739079446b16fc054740da8d86ed099942cf5deed6597cedb64c058f3def587a8b4689  modloop.confd
-d76c75c58e6f4b0801edac4e081b725ef3d50a9a8c9bbb5692bf4d0f804af7d383bf71a73d5d03ed348a89741ef0b2427eb6a7cbf5a9b9ff60a240639fa6ec88  sysfsconf.initd"
+02eb7a0b430f0dd985dc1a6cdcca41b1f0dca1a2c164364713ff6706511884295a1ccbd51c87686ffc197ca5cd093be5404fba98d21cf4e4076535706a67f106  sysfsconf.initd"
diff --git a/system/openrc/modloop.initd b/system/openrc/modloop.initd
index 9d664dd40..85ad2b165 100644
--- a/system/openrc/modloop.initd
+++ b/system/openrc/modloop.initd
@@ -24,9 +24,10 @@ mountdirs() {
 
 find_modloop() {
 	local dir="$1"
-	local kver=$(uname -r)
+	local kver="$(uname -r)"
 	local oifs="$IFS"
-	IFS=$'\n'
+	IFS="
+"
 	set -- $(blkid "$dir"/boot/* "$dir"/*)
 	IFS="$oifs"
 	for line; do
@@ -42,7 +43,7 @@ find_modloop() {
 
 find_backing_file() {
 	local dir="$1"
-	local dev=$(df -P "$dir" | tail -1 | awk '{print $1}')
+	local dev="$(df -P "$dir" | tail -1 | awk '{print $1}')"
 	cat /sys/block/${dev#/dev/}/loop/backing_file 2>/dev/null
 }
 
diff --git a/system/openrc/sysfsconf.initd b/system/openrc/sysfsconf.initd
index 433e51d63..5d4f9aeab 100644
--- a/system/openrc/sysfsconf.initd
+++ b/system/openrc/sysfsconf.initd
@@ -12,14 +12,14 @@ setval() {
 	local value="$1" attrib="$2"
 	# Some fields need a terminating newline, others
 	# need the terminating newline to be absent :-(
-	echo -n "$value" > "$attrib" 2>/dev/null \
-		|| echo "$value" > "$attrib"
+	printf '%s' "$value" > "$attrib" 2>/dev/null \
+		|| printf '%s\n' "$value" > "$attrib"
 }
 
 load_conffile() {
 	local file="$1"
 	while read line; do
-		local line=${line%%#*}
+		local line="${line%%#*}"
 		local cmd= attrib= value=
 		set -- $line
 		if [ $# -eq 0 ]; then
diff --git a/system/paxmark/APKBUILD b/system/paxmark/APKBUILD
index 767803915..3c9c69400 100644
--- a/system/paxmark/APKBUILD
+++ b/system/paxmark/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=paxmark
 pkgver=0.11
-pkgrel=0
+pkgrel=1
 pkgdesc="Manage PaX marking of executables"
 url="https://alpinelinux.org"
 arch="noarch"
 options="!check"
 license="GPL-2.0-only"
-depends="attr"
+depends="attr bash"
 makedepends=""
 install=""
 subpackages=""
@@ -20,4 +20,4 @@ package() {
 	ln -s paxmark "$pkgdir"/usr/sbin/paxmark.sh
 }
 
-sha512sums="c43b5a48a8ac14b027114f712820b1fb8b0e209fcfe1a69eb64b4c68289a3bb3f26c3ea40350cbfdaa97329b4a8e1de2582025e5221c3016aff85bb75118e665  paxmark"
+sha512sums="ed904790bfa6c86e216e2c8c1ed8fb1f997b7d1a55f997459655e402d8eec6447095709e38472cf909ea4d03e623e3e0eeddc0da57378901fe9d18d8c14b68d8  paxmark"
diff --git a/system/paxmark/paxmark b/system/paxmark/paxmark
index f80eb69ff..87a84f4f7 100644
--- a/system/paxmark/paxmark
+++ b/system/paxmark/paxmark
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 ret=0
 flags="${1//[!zPpEeMmRrSs]}"