diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-07-24 05:54:10 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-07-24 05:54:10 +0000 |
| commit | bed7a51ed2c79f05cb1cf4708d4e128cfb23133a (patch) | |
| tree | ec42f502556c869d54bc511d1c8f3248db80d566 /user/php7 | |
| parent | 6574a30b9b98a3464ff4cebe381b3732a8dabfc3 (diff) | |
| parent | d88486a76bb0d6bafb97fc9f0b5ae909f61b18e8 (diff) | |
| download | packages-bed7a51ed2c79f05cb1cf4708d4e128cfb23133a.tar.gz packages-bed7a51ed2c79f05cb1cf4708d4e128cfb23133a.tar.bz2 packages-bed7a51ed2c79f05cb1cf4708d4e128cfb23133a.tar.xz packages-bed7a51ed2c79f05cb1cf4708d4e128cfb23133a.zip | |
Merge branch 'openrc-bashisms' into 'master'
Cleanup OpenRC init.d scripts, and more
See merge request adelie/packages!295
Diffstat (limited to 'user/php7')
| -rw-r--r-- | user/php7/APKBUILD | 4 | ||||
| -rw-r--r-- | user/php7/php-fpm.initd | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD index 6c6b08849..25b5af5ae 100644 --- a/user/php7/APKBUILD +++ b/user/php7/APKBUILD @@ -42,7 +42,7 @@ pkgname=php7 _pkgname=php pkgver=7.2.20 -pkgrel=0 +pkgrel=1 _apiver=20170718 pkgdesc="The PHP7 language runtime engine" url="https://php.net/" @@ -532,7 +532,7 @@ _mv() { } sha512sums="8c32cb46e34440f3af905e9fc73d327e28c62b5b1b4b7f7221b192364b409172a88ae9f35aef40b796a81fbe87b8b64dec214cbf54011f5af53d9e8eddc9b3fa php-7.2.20.tar.bz2 -23df4e779c809db3e3b8e5b0353b1aafaad2f3dc56f2d1cd45f9b0e3ad71b32e40700d6ebfe914b3c87e8e0b670d0dc862ded1e5c898adf160e33dea372e044f php-fpm.initd +cb3ba48fbd412f12d98ef1f88b509b40bc4ca44a16779a06d43e4db3cb8d24d54404b9e11ca941b5339af8d3281ca9c8ea3ba5ced4339f91fb40608b5ce9a647 php-fpm.initd 01d4ba3ef104ea378eb0e8cbb7bdee3fdf65e4bd6865eb3bc6c0dc4af31c2d52887abdf0150b5ef984b877860285a3b1af84b11ffebb5b8b722ea9faf83edfeb php-fpm.logrotate a7f9ba5e11652fd1cb9e756c3269269a95de083ecb5be936a85c7a09c1396db9088e0251c6a643c40235c0e776fce2a471e5c7f5a033b85c7d3b3110c2b39e48 php-module.conf b1008eabc86fcff88336fe2961e3229c159c930a05d97359136c381c5c1cc572a33110308a3e5ef5e31c60327f76c9ef02b375cd2ea8ff9caa7deeddc216f4ce disabled-tests.list diff --git a/user/php7/php-fpm.initd b/user/php7/php-fpm.initd index 46c65ec2e..88a87d458 100644 --- a/user/php7/php-fpm.initd +++ b/user/php7/php-fpm.initd @@ -51,9 +51,10 @@ start_pre() { # If unix socket is used (instead of TCP/IP), then ensure that the # directory exists and has correct privileges. local listen="$(conf_get listen)" - if [ "${listen:0:1}" = "/" ]; then - checkpath -d -o $user:$group "$(dirname "$listen")" - fi + case "$listen" in + /*) + checkpath -d -o $user:$group "$(dirname "$listen")";; + esac checkpath -d "$(dirname "$pidfile")" } |