From 2707df6cc761dcc2341faa8bafec5b4b4fa33e4d Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Mon, 22 Jul 2019 20:15:07 -0400
Subject: system/*, user/*: remove bashisms from initd scripts

---
 user/postgresql/APKBUILD         | 4 ++--
 user/postgresql/postgresql.initd | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'user/postgresql')

diff --git a/user/postgresql/APKBUILD b/user/postgresql/APKBUILD
index 97300d986..87a397f3d 100644
--- a/user/postgresql/APKBUILD
+++ b/user/postgresql/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=postgresql
 pkgver=10.9
-pkgrel=0
+pkgrel=1
 pkgdesc="Featureful object-relational database system (RDBMS)"
 url="https://www.postgresql.org/"
 arch="all"
@@ -259,7 +259,7 @@ sha512sums="4e2f30a0fd262f2e3ce5fc836425be635326600cd6cd4e117c57f59ea7ab2e9ea463
 5f9d8bb4957194069d01af8ab3abc6d4d83a7e7f8bd7ebe1caae5361d621a3e58f91b14b952958138a794e0a80bc154fbb7e3e78d211e2a95b9b7901335de854  perl-rpath.patch
 8439a6fdfdea0a4867daeb8bc23d6c825f30c00d91d4c39f48653f5ee77341f23282ce03a77aad94b5369700f11d2cb28d5aee360e59138352a9ab331a9f9d0f  conf-unix_socket_directories.patch
 1966b2a3971f56fbecd8daa45965236d487683e13300e5c000e595bbadbbe9d0e1301fbbfa034f452abe8a4e4a427781f772370b9ff392bb03fc11ee43c9dee7  disable-broken-tests.patch
-224e80f9e62843fd248e625abdd0d9fe477729ff3f9a64fc5c86dd37bb7176d3504107fbed7ce578e3a1db7f60b8cf2abf5fe4862c81f76b6d026e29ca495cfc  postgresql.initd
+2c3aab4b24e0e1f60c3bd5aa2e24d93d3480711389e48454ed7cd7713eb27df7e1b29970ba1931ad0ae810458fae9e5cc7b6b6e2a24924eb4c493c6e7088ae75  postgresql.initd
 a6d9cba5c7270484b3a22083b2b37742faefb01b6643040050c92235840c601b2e206ebda32804937b729c6cf42c79a558b921900e52fc420df2a03b5f29e1f7  postgresql.confd
 f5a1cba051e7d846c2d16703514601cb25729ed96b677c9bd0c199d64552120a8b14b238af01917fdb87106681e12dee6fff7447558155ba273e4f96be5e2892  pg-restore.initd
 c14a5684e914abb3b0ee71bbf15eed71a9264deacaa404a6e3af6bfc330d93e7598624d0ed11a94263106cc660f7f54c8ff57e759033cf606a795f69ff6c1c7c  pg-restore.confd
diff --git a/user/postgresql/postgresql.initd b/user/postgresql/postgresql.initd
index 846229a40..1c1a5dcf9 100644
--- a/user/postgresql/postgresql.initd
+++ b/user/postgresql/postgresql.initd
@@ -63,8 +63,8 @@ start_pre() {
 		fi
 	fi
 
-	local socket_dirs=$(get_config "unix_socket_directories" "/run/postgresql")
-	local port=$(get_config "port" "$port")
+	local socket_dirs="$(get_config "unix_socket_directories" "/run/postgresql")"
+	local port="$(get_config "port" "$port")"
 
 	start_stop_daemon_args="$start_stop_daemon_args --env PGPORT=$port"
 
@@ -124,7 +124,7 @@ stop() {
 		&& retry="$retry/SIGQUIT/$force_timeout" \
 		|| force_timeout=0
 
-	local seconds=$(( $nice_timeout + $rude_timeout + $force_timeout ))
+	local seconds="$(( $nice_timeout + $rude_timeout + $force_timeout ))"
 
 	ebegin "Stopping PostgreSQL (this can take up to $seconds seconds)"
 
-- 
cgit v1.2.3-60-g2f50