diff options
| author | Max Rees <maxcrees@me.com> | 2019-07-22 20:15:07 -0400 |
|---|---|---|
| committer | Max Rees <maxcrees@me.com> | 2019-07-22 20:15:07 -0400 |
| commit | 2707df6cc761dcc2341faa8bafec5b4b4fa33e4d (patch) | |
| tree | 9df7c2d2fd84f153634581ff4fb249b98bf34ffa /user/apache-httpd | |
| parent | b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71 (diff) | |
| download | packages-2707df6cc761dcc2341faa8bafec5b4b4fa33e4d.tar.gz packages-2707df6cc761dcc2341faa8bafec5b4b4fa33e4d.tar.bz2 packages-2707df6cc761dcc2341faa8bafec5b4b4fa33e4d.tar.xz packages-2707df6cc761dcc2341faa8bafec5b4b4fa33e4d.zip | |
system/*, user/*: remove bashisms from initd scripts
Diffstat (limited to 'user/apache-httpd')
| -rw-r--r-- | user/apache-httpd/APKBUILD | 4 | ||||
| -rwxr-xr-x | user/apache-httpd/apache-httpd.initd | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD index 90a098922..fe6dd6672 100644 --- a/user/apache-httpd/APKBUILD +++ b/user/apache-httpd/APKBUILD @@ -3,7 +3,7 @@ pkgname=apache-httpd _pkgreal=httpd pkgver=2.4.39 -pkgrel=1 +pkgrel=2 pkgdesc="Open-source HTTP server" url="https://httpd.apache.org" arch="all" @@ -138,7 +138,7 @@ ldap() { sha512sums="9742202040b3dc6344b301540f54b2d3f8e36898410d24206a7f8dcecb1bea7d7230fabc7256752724558af249facf64bffe2cf678b8f7cccb64076737abfda7 httpd-2.4.39.tar.bz2 c8bc2bb06ae51b0956e0ee673e80c444551c9b33dfcbb845106477c46d9e52786a8896022e1f00102264fecdf66e35e47fc6cf0abe9836fa536735cff4e6adf4 adelie.layout 336e81fa0d08f8fbe6243d52bd59b12cf2e925deb49b29d7a22953c5d40a951b6b753f51e5a396752cb0bbaf1cf25b1358902f375fb65639d00e62db7ae55ff2 apache-httpd.confd -9893248f1724748c9ef91171728b4c557ced7de543e23ed72cb75c02728048b2813ac99015a4a28e7984daa51faa6e42403c17b875539fe71c33424865eccecf apache-httpd.initd +5762d53f39ce7ecd730e05ddf6c063ede65cd75b9e7d67217784c80366646491ef9474306e8eb119c8fb5b4358407b07636a4e9cd82325d8df4e3e00dabc3459 apache-httpd.initd 18e8859c7d99c4483792a5fd20127873aad8fa396cafbdb6f2c4253451ffe7a1093a3859ce719375e0769739c93704c88897bd087c63e1ef585e26dcc1f5dd9b apache-httpd.logrotate cba279f31c12c3516bacf74856493c5a62a94017b3911d457b33e350af646b3e97632b15e396992e5115532c88c81fdd680a951ca0c71eb8a207f39d6c027c41 httpd.conf 83d57c57b809340bb07291c340ded5903ae55c0bba7c48e4eb0d27529ce4ecb6e235378ad770c69c8be2762b5346fa5bec94b6c585510719c37fe6addb33f998 alias.conf diff --git a/user/apache-httpd/apache-httpd.initd b/user/apache-httpd/apache-httpd.initd index c18643735..24be3e172 100755 --- a/user/apache-httpd/apache-httpd.initd +++ b/user/apache-httpd/apache-httpd.initd @@ -114,7 +114,7 @@ fullstatus() { if ! service_started "${SVCNAME}"; then eerror "${SVCNAME} not started" - elif ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then + elif ! command -v "$(set -- ${LYNX}; printf '%s' "$1")" 2>&1 >/dev/null; then eerror "lynx not installed!" else ${LYNX} ${STATUSURL} @@ -134,7 +134,7 @@ configdump() { if ! service_started "${SVCNAME}"; then eerror "${SVCNAME} not started" - elif ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then + elif ! command -v "$(set -- ${LYNX}; printf '%s' "$1")" 2>&1 >/dev/null; then eerror "lynx not installed!" else echo "${HTTPD} started with '${HTTPD_OPTS}'" |