Skip to content

Commit f0d85f4

Browse files
committed
linter
1 parent 2127d03 commit f0d85f4

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

package/debian/postinst.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if [ "$1" = "configure" ]; then
3333
fi
3434
fi
3535

36-
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
36+
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ]; then
3737
# This will only remove masks created by d-s-h on package removal.
3838
deb-systemd-helper unmask frankenphp.service >/dev/null || true
3939

package/rhel/postinstall.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ if [ -x /usr/sbin/getsebool ]; then
1111
fi
1212
if [ -x /usr/sbin/semanage ] && [ -x /usr/sbin/restorecon ]; then
1313
# file contexts
14-
semanage fcontext --add --type httpd_exec_t '/usr/bin/frankenphp' 2> /dev/null || :
15-
semanage fcontext --add --type httpd_sys_content_t '/usr/share/frankenphp(/.*)?' 2> /dev/null || :
16-
semanage fcontext --add --type httpd_config_t '/etc/frankenphp(/.*)?' 2> /dev/null || :
17-
semanage fcontext --add --type httpd_var_lib_t '/var/lib/frankenphp(/.*)?' 2> /dev/null || :
14+
semanage fcontext --add --type httpd_exec_t '/usr/bin/frankenphp' 2>/dev/null || :
15+
semanage fcontext --add --type httpd_sys_content_t '/usr/share/frankenphp(/.*)?' 2>/dev/null || :
16+
semanage fcontext --add --type httpd_config_t '/etc/frankenphp(/.*)?' 2>/dev/null || :
17+
semanage fcontext --add --type httpd_var_lib_t '/var/lib/frankenphp(/.*)?' 2>/dev/null || :
1818
restorecon -r /usr/bin/frankenphp /usr/share/frankenphp /etc/frankenphp /var/lib/frankenphp || :
1919
fi
2020
if [ -x /usr/sbin/semanage ]; then
2121
# QUIC
22-
semanage port --add --type http_port_t --proto udp 80 2> /dev/null || :
23-
semanage port --add --type http_port_t --proto udp 443 2> /dev/null || :
22+
semanage port --add --type http_port_t --proto udp 80 2>/dev/null || :
23+
semanage port --add --type http_port_t --proto udp 443 2>/dev/null || :
2424
# admin endpoint
25-
semanage port --add --type http_port_t --proto tcp 2019 2> /dev/null || :
25+
semanage port --add --type http_port_t --proto tcp 2019 2>/dev/null || :
2626
fi

package/rhel/postuninstall.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ if [ "$1" -eq 0 ]; then
1313
fi
1414
if [ -x /usr/sbin/semanage ]; then
1515
# file contexts
16-
semanage fcontext --delete --type httpd_exec_t '/usr/bin/frankenphp' 2> /dev/null || :
17-
semanage fcontext --delete --type httpd_sys_content_t '/usr/share/frankenphp(/.*)?' 2> /dev/null || :
18-
semanage fcontext --delete --type httpd_config_t '/etc/frankenphp(/.*)?' 2> /dev/null || :
19-
semanage fcontext --delete --type httpd_var_lib_t '/var/lib/frankenphp(/.*)?' 2> /dev/null || :
16+
semanage fcontext --delete --type httpd_exec_t '/usr/bin/frankenphp' 2>/dev/null || :
17+
semanage fcontext --delete --type httpd_sys_content_t '/usr/share/frankenphp(/.*)?' 2>/dev/null || :
18+
semanage fcontext --delete --type httpd_config_t '/etc/frankenphp(/.*)?' 2>/dev/null || :
19+
semanage fcontext --delete --type httpd_var_lib_t '/var/lib/frankenphp(/.*)?' 2>/dev/null || :
2020
# QUIC
21-
semanage port --delete --type http_port_t --proto udp 80 2> /dev/null || :
22-
semanage port --delete --type http_port_t --proto udp 443 2> /dev/null || :
21+
semanage port --delete --type http_port_t --proto udp 80 2>/dev/null || :
22+
semanage port --delete --type http_port_t --proto udp 443 2>/dev/null || :
2323
# admin endpoint
24-
semanage port --delete --type http_port_t --proto tcp 2019 2> /dev/null || :
24+
semanage port --delete --type http_port_t --proto tcp 2019 2>/dev/null || :
2525
fi
2626
fi

package/rhel/preinstall.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
getent group frankenphp &> /dev/null || \
4-
groupadd -r frankenphp &> /dev/null
5-
getent passwd frankenphp &> /dev/null || \
6-
useradd -r -g frankenphp -d /var/lib/frankenphp -s /sbin/nologin -c 'FrankenPHP web server' frankenphp &> /dev/null
3+
getent group frankenphp &>/dev/null || \
4+
groupadd -r frankenphp &>/dev/null
5+
getent passwd frankenphp &>/dev/null || \
6+
useradd -r -g frankenphp -d /var/lib/frankenphp -s /sbin/nologin -c 'FrankenPHP web server' frankenphp &>/dev/null
77
exit 0

0 commit comments

Comments
 (0)